diff options
author | 2018-09-12 14:10:10 -0700 | |
---|---|---|
committer | 2018-09-12 14:10:10 -0700 | |
commit | 382fcc010ddaeb93ea15aac82470e0daabe5b0b8 (patch) | |
tree | c59e465bb43994b0d6f017938685c6e1d1b4eb2d | |
parent | 428af68e64b22b8f3ec0f573c74afcbf9ebaac7e (diff) | |
download | subsurface-382fcc010ddaeb93ea15aac82470e0daabe5b0b8.tar.gz |
Pull latest translations from Transifex
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
30 files changed, 32206 insertions, 30720 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 82f459b5f..af1ddf6a9 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -167,160 +167,160 @@ <translation>Сканиране на дистанционни устройства...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Скиранирането приключи успешно.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Локалното Bluetooth устройство бе %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>включено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>изключено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Статус: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Устройството %1 може да бъде използвано за връзка. Може да натиснете бутона Зaпиши.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Устойството %1 трябва да бъде чифтосано за да бъде използвано. Моля използвайте контекст менюто за опции.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Устройство не трябва да има нулев адрес на връзка.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Локалното устройство бе променено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Чифт</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Дистанционно чифтосване</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Опит за чифтосване на устройство %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Опит за раз-чифтосване на устройство %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Устройство %1 бе раз-чифтосано.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Устройство %1 бе чифтосано.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Устроството %1 бе чифтосано и оторизирано.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Устройството %1 може да бъде използвано за връзка. Може да натиснете бутона Запиши.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Грешка в локално устройство: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Грешка при чифтосване. Ако дистанционното устройство изисква PIN код, моля опитайте да чифтосате устройствата използвайки операционната система.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Непозната грешка</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetooth адаптера е изключен, включете го преди да извършите откритието на устройството.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Грешка при четенето или записа на устройството.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Непозната грешка.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Грешка при откритие на устройството: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Липсва</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Локалния Bluetooth адаптер е недостъпен.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Агента за открития на устройства не бе създаден, защото адреса %1 не пасва на физическия адрес на адаптера на нито едно локално Bluetooth устройство.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Лице:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Търсене за партньори и водачи</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Няма партньори</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Бекъп на настройки на гмуркачески компютър</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Бекъп файлове</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML бекъп грешка</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Грешка при запис на бекъп файл. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Бекъп успешен</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Вашите настройки бяха записани в: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Върни настройки на гмуркачески компютър</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Грешка при XML връщане</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Настъпи грешка докато се връщаше бекъп файла. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Връщане успешно</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Вашите настройки бяха върнати успешно.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Изберете фърмуер файл</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Всички файлове</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Регистър файлове</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Свръзване към устройство...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Устройство свързано</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Прекъсната връзка с устройство</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Избери файл за запис от гмуркачески компютър</translation> </message> @@ -1973,22 +1973,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Данни за гмуркане</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Изтрий гмуркане</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Отмени редакция</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Покажи на карта</translation> </message> @@ -1996,104 +1996,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Гмуркане %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Дата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Местонахождение:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Координати:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Използвай текуща GPS позиция:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Дълбочина:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Продължителност:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Темп. на въздух:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Темп. на водата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Водолазен костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Партньор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Водач:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Тегло:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Бутилка:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Газ микс:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Начално налягане:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Крайно налягане:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Оценка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Видимост</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Бележки:</translation> </message> @@ -2262,104 +2294,119 @@ GPS позиция:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Свиване на други</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Изтрий гмуркане (гмуркания) от пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Създай ново пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Слей пътуване с горно пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Слей избраните гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Преномерирай гмуркане (гмуркания)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Измести времена на гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Рздели избраните гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Зареди изображение(изображения) от файл(файлове).</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Зареди изображение от интернет</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Файлове с изображения (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 не е изображение</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Файлове с изображения</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Отвори изображения</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Всички файлове</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 не е изображение</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS позиция:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Светла</translation> </message> @@ -2570,121 +2617,121 @@ GPS позиция:</translation> <translation>Пясък</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Общ формат, който се използва за обмен на данни между различни видове програми.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Данни разделени със запетая, описващи гмуркаческия профил.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Данни разделени със запетая описващи гмуркането. Това не включва информация за профила.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Изпрати данните от гмуркането към сайта divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Изпрати данни към уебсайта dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML експорт на местонахождения, визуализирани на световната карта.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface XML формат</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Запиши дълбочините във файл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Запиши гмуркане като TeX макрота във файл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Експорт на като UDDF файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF файлове</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX файлове</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Експорт на СSV файл като</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Експорт на световна карта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Експорт на Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Запиши дълбочините</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Експорт като TeX файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Експортирай HTML файлове като</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Моля изчакайте, експортиране...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Не може да бъде отворен файл %s</translation> </message> @@ -3044,62 +3091,62 @@ GPS позиция:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>Бут.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Финална дълбочина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Teчащо време</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Режим на гмуркане</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Стоп времена</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Бутилка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Тагове</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Снимки</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Държава</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Партньор</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Снимки преди/по време на/след гмуркане</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>няма избрани гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>стиловете за експорт към divelogs.de не могат да бъдат намерени</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>не може да бъде създаден ZIP файл за качване: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>вътрешна грешка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Конверсията на гмуркане %1 към формата на divelogs.de не може да бъде извършена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>грешка при писане на zip файл: %s zip грешка %d системна грешка %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Обновяване на списъка от гмуркания...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Изтегляне на списък от гмуркания...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Изтегляне на %1 гмуркания...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Изтеглянето приключи - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Проблем при тегленето</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Архива не може да бъде отворен: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Неправилно изтегляне</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Архива не може да бъде отворен: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Качването приключи</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Грешка при качването</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Успешно качване</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Грешка при логин</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Не може да бъде направен разбор на отговора</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Изтегли</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Избери режим на Bluetooth теглене</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Връзване с леководолазен компютър</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Грешка</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Намери Uemis леководолазен компютър</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Откажи теглене</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Избери файл за запис от гмуркачески компютър</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Регистър файлове</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Избери файл за запис от бинерен дъмп файл.</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Дъмп файлове</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Повтори теглене</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Изтегли</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Отмяна</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth не е включен</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Производител:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Леководолазен компютър</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Връзка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Опитай пак</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Изход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Пресканиране</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Изтеглени гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Информация:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Приеми</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Селектирай всички</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Деселектирай всички</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Вържи към Фейсбук текст</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>За да откачине Subsurface от фашия Facebook акаунт използвайте 'Сподели към' - 'Share on' - менюто.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>За да се свържете с Facebook, моля въведете потребител и парола. Това позволява на Subsurface да публикува гмуркания на вашия таймлайн.</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Вход във Фейсбук успешен</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Грешка - непознат потребител.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Гмуркането бе качено успешно във Фейсбук</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Качването на гмуркане неуспешно. Моля вижте дебъг текста и го пратете на Subsurface мейлинг списъка.</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Селектирай всички</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Деселектирай всички</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Инвертиране на селекцията</translation> </message> @@ -3932,18 +3996,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Намери преместени изображения</translation> + <source>Find moved media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Намерени изображения</translation> + <source>Found media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Намери изображения в избраното гмуркане (гмуркания)</translation> + <source>Match only media files in selected dive(s)</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3958,8 +4022,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Обходи папки с изображения</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3973,18 +4037,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>Не могат да бъдат намерени изображения</translation> + <source>No matching media files found</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>Намерени <b>%1</b> изображения в тяхната текуща локация.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>Намерени <b>%1</b> изображения в тяхната текуща локация.</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Местонахождение: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Местонахождение</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (същия GPS фикс)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 надалеч</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n гмуркане(гмуркания) тук)</numerusform><numerusform>, %n гмуркане(гмуркания) тук)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(няма GPS данни. добави GPS фикс от текущото гмуркане)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(няма GPS данни)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Избери място:</translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Няма зададено местонахождение</translation> </message> @@ -4242,8 +4306,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Бележки</translation> </message> @@ -4264,19 +4328,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Темп. на въздух</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Темп. на водата</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -4357,8 +4421,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Снимки</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ p, li { white-space: pre-wrap; } <translation>Добави система за тежест</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Tемп. на въздуха [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Темп. на водата [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Това пътуване се редактира.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Редактира се повече от едно гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Това гмуркане се редактира.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Бележки за пътуване</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Местонахождение на пътуване</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Ново място за гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Изтрий промените?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Вие ще изтриете промените.</translation> </message> @@ -4470,424 +4534,419 @@ p, li { white-space: pre-wrap; } <translation>&Вмъкване</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Редактирай</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Сподели на</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Нов регистър</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Нов</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Отвори регистър</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Отвори</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Запиши</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Запиши</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>З&апиши като</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Запиши като...</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Затвори</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Затвори</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Напечатай</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>На&стройки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Изход</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Изтегли от леководолазен &компютър</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Вмъкни &GPS данни от Subsurface уеб услуга</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>&Редактирай имена на устройства</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Добави гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>§Редактиране на гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Копирай компоненти на гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Залепи компоненти на гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Преномерирай</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Автоматично &групиране</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Годишни &статистики</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Списък на гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Профил</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Информация</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Всички</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>&Предишен ГК</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Следващ ГК</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&За Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Ръководство за &потребителя</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Карта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>&Планирай гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Вмъкни регистър файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Вмъкни регистър файлове от други приложения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>&Вмъкни от divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Цял екран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Превключи цял екран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Провери за обновления</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Експорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Експорт на гмуркачески регистри</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Настрой &леководолазен комютър</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Редакция на гмуркането в плановика</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Превключи pО₂ диаграма</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Превключи pN₂ диаграма</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Превключи pHе диаграма</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Превключи отчетен таван на гмуркачески компютър</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Превключи калкулиран таван</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Превключи калкулация на всички тъкани</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Превключи калкулиран таван с 3м нарастване</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Превключи показване на пулс</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Превключи MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Превключи EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Превключи NDL. TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Превключи SAC скорост</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Превключи линеал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Скалирай диаграмата</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Превключи изображения</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Преключи газ</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Филтрирай списъка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Превключи тъканно топлинна диаграма</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Потребителско &изследване</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Отмени</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Върни</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Намери преместени изображения</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>&Отвори облаковия склад</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>&Запиши в облковия склад</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Редакция на места за гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Редакция на място за гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Облаковия слад е онлайн</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Свържи се към</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Излючи се от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Отвори файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Опит за смесване на гмуркания с %1мин. интервал помежду им</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Създаден бе бекъп на темплейти</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,213 +4969,213 @@ can overwrite them on startup.</source> Subsurface може да ги подменя при стартирането си.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да стартирате онлайн режима.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Имате незаписани промени. Желаете ли да ги добавите в облаковия склад? Ако кажете "Не", облакът ще бъде синхорнизиран при следващото повикване към "Отвори облаковия склад" или "Запиши в облаковия склад".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Грешка при зареждане на облаковия слад онлайн</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Гмуркачески регистър файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Всички файлове</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Желаете ли да запишете промените във файла %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[локален кеш за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[облаков склад за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Отваряне на файл от стара версия</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вие отворихте файл от стара версия на Subsurface. Моля прочетете Ръковордството на потребителя за да разберете за промените в новата версия и конкретно за редакцията на места за гмуркане. Subsurface вече се опита да попълни данните автоматично, но би било добре да проверите дали местата за гмуркане са правилни.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Връзване към обклаковия склад...</translation> </message> @@ -5173,7 +5232,7 @@ QML модулите QtPositioning и QtLocation може да липсват!</ <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Филтърът показва %1 (от %2) гмуркания</translation> </message> @@ -5181,12 +5240,12 @@ QML модулите QtPositioning и QtLocation може да липсват!</ <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Препоръчваме да обновите фърмуера на вашия гмуркачески компютър: имате версия %1, а последната стабилна версия е %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5195,27 +5254,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Ако устройството използва Bluetooth, моля изпълнете същите проготовления като упдейт на гмуркачески регистър преди да продължите с този ъпдейт</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Не сега</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Обнови фърмуер</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Уведомление за обновяване на фърмуера</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Запиши изтегления фърмуер като</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware файлове</translation> </message> @@ -5353,8 +5412,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Няма файл по подразбиране</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5378,6 +5437,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5408,29 +5468,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Изтрий всички настройки</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Върни всики настройки по подразбиране</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Общи</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Отвори файла по подразбиране</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5585,8 +5670,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Обнови тъмбнайлове ако са по-стари от изображенията</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5625,7 +5710,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Покажи средна дълбочина в профила</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Профил</translation> </message> @@ -5704,27 +5789,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Тези ще бъдат изполвани както са в момента. Това може да не е това, което имате в предвид. Вижте http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Буквални символи</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Нормален/нормални символ/(символи) във времевия формат. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Нормален/нормални символ/(символи) в дата формата. @@ -5776,7 +5861,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface облков склад</translation> </message> @@ -5801,73 +5886,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Запиши паролата локално?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface уеб услуга</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Потребителски ID по подразбиране</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Запази потребителски ID локално</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Мрежа</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Без прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Системно прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Промяната игнорирана. Е-мейла и паролата за облаковия склад могат да съдържат само букви, числа, '.', '-', '_' и '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Промяната игнорирана. Е-мейла и новата парола за облаковия склад могат да съдържат само букви, числа, '.', '-', '_' и '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, '.', '-', '_' и '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface облков склад (паролата проверена)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Облаков склад (невалидна парола)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Облаков слад (нужен е ПИН)</translation> </message> @@ -6196,133 +6266,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (№%1 от %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Непознат гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Добави промяна на газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Планирано гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Ръчно добавено гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Изтрий този гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (бут. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Добави set-point промяна</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Добави бележка</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Раздели гмуркане на две</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Смени режим на гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Редакция на профил</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Премахни събитие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Премахни малки събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Редактирай име</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Покажи всички събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Скрий събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Скрий всички %1 събития?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Премахни избраните събития?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Редактирай име в показалец</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Потребителско име:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation> Името е прекалено дълго!</translation> </message> @@ -6330,53 +6400,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Стартиране...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Отвори локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Отварянето на локален файл с данни неуспешно</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 гмуркания заредени от локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>режим на работа без облак</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Грешка при разряда на локалния склад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>няма облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Моля въведете валидни облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, '.', '-', '_' и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Грешен формат на имейл адрес</translation> </message> @@ -6426,50 +6496,50 @@ Please export this template to a different file.</source> <translation>Няма връзка към облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Зареждане на гмуркания...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Грешка в облаков слад: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Зареждане на гмуркания от локален склад (режим без облак)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Не може да бъде осъществена връзка с облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облаковия слад беше отворен успешно. Няма гмуркания в регистъра.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>ч.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>сек.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Непозната GPS позиция</translation> </message> @@ -6477,7 +6547,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Стартиране...</translation> </message> @@ -6569,116 +6639,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Неопределен</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Грешен потребител или парола</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Потребител и парола трябва да бъдат проверени</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Потребител и парола потвърдени</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Режим без облак</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Статус на облака</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Е-мейл</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Не приложимо</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Промени</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Син</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>Обикновен текст</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Подчертай</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Розов</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Тъмен</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS уеб услуга</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Праг на разстояние (метри)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Праг на време (минути)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Бутилка по подразбиране</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Бутилка:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Покажи меню на разработчик</translation> </message> @@ -6713,15 +6793,14 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Внимание! -Не всички изображения имат времеви печати в диапазона 30 минути преди началото и 30 минути след края на избраното гмуркане.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Зареди изображения дори ако времената им не съвпадат с времето на гмуркането</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6744,39 +6823,39 @@ Not all images have timestamps in the range between <translation>Коя дата и час са показани на снимката?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Файлове с изображения</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Дата и време на избраното гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Дата и време на първото избрано гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Дата и време на последното избрано гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Файлове с неправилна дата или време</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Дата и време не можат да бъдат намерени в Exif</translation> </message> @@ -6869,28 +6948,28 @@ Files with inappropriate date/time</source> <translation>Съобщения при вмъкване (грешки, предупреждения и пр.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Отварене на SmartTrak файлове</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak файлове</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Всички файлове</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface файлове</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Отвори Subsurface файлове</translation> </message> @@ -6898,64 +6977,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Малък</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Средно</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Дата на гмуркане: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Времетраене: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Местонахождение: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Партньор: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Водач: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7092,65 +7171,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Въведете потребителски ID и натиснете "Изтегли"</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Уеб услуга</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Свръзване...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Изтеглянето приключи</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Грешка при изтеглянето: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Грешка при връзка: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Грешен потребителски ключ</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Не може да бъде напревен разряд!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Успешно изтегляне</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Костюми:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Няма избран костюм</translation> </message> @@ -7281,39 +7312,44 @@ Files with inappropriate date/time</source> <translation>Ниво на зуум</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Зареди изображение(изображения) от файл(файлове).</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Зареди изображение(изображения) от интернет</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Изтрий избраните изображения</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Изтрий всички изображения</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Обнови избраните тъмбнайлове</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Изтриване на изображения</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Сигурни ли сте, че искате на изтриете всички изображения?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7481,15 +7517,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Тагове:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Тагове</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Празни тагове</translation> </message> @@ -7688,7 +7724,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1щтракни за да посетиш %2</translation> </message> @@ -7712,130 +7748,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 показани)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Бутилка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Тагове</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Партньор</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>ч.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Снимки преди/по време на/след гмуркане</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Държава</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -7849,81 +7890,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Въведете URL за изображения</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Провери за обновления</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface не успя да провери за обновления.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Грешка:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Моля проверете интернет връзката си.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Вие използватe последната версия на Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Има нова версия на Subsruface.<br/>Щракнете на:<br/><a href="%1">%1</a><br/> за да я изтеглите.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Има нова версия на Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Последната версия е %1, моля проверете %2 нашата страница %3 за информация как да обновите.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Най-новата весия е</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Сървъра върна следната информация:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface проверява за нова версия всеки две седмици. Ако не желаете Subsurface да продължи да проверява, моля натиснете Откажи.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Откажи</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Приеми</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Автоматична проверка за обновления</translation> </message> @@ -8099,6 +8140,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8154,12 +8208,12 @@ Language: %1</source> <translation>Качи</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Времето за операцията изтече</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Трансфер на данни...</translation> </message> @@ -8185,8 +8239,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Няма грешка</translation> </message> @@ -8310,7 +8364,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Грешка при рaзряд на хедър</translation> </message> @@ -8647,9 +8701,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8664,131 +8718,131 @@ Maximum</source> <translation>Отворена верига</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>паскала</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>кб.фута</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>м/сек</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>фута/мин</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>фута/сек</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>въздух</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>вградена</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>колан</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>глезен</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>Нагръбна тежест</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>щипка</translation> </message> @@ -8865,123 +8919,123 @@ Maximum</source> <translation>Не може да бъде намерен профил от '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Поръка от облаков склад (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Трансфер от облаков склад (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Трансфер към облаков склад (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Локалната кеш папка %s е повредена - не може да се синхронизира с облаковия склад.</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Локалния кеш не може да бъде обновен.</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Облаковия слад е повреден</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Не може да бъде обновен облаковия слад. Моля опитайте по-късно.</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Дистанционния склад и локалните данни се разминават . Грешка: сливането се провали (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Облаковия слад и локалните данни се разминават. Данните не могат да бъдат сляти.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Облаковия слад и локалните данни се разминават</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Облаковия слад и локалните данни се разминават. Грешка: записа на данни се провали (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Проблем с локалния кеш на облаковия слад</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Преместване на кеша в %s. Моля опитайте отново.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Обнови локалния склад да съвпада с облаковия.</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Качи локалните промени в облака</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Опитай да смесиш локалните промени в облака</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Запази данните в облака</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Синхронизирай с облака</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Облаковия сървър не може да бъде намерен. Работа с локални данни.</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Успешна връзка с облака. Теглене на данни.</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Синхронизацията с облака завършена</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Грешка при връзка с облаковия склад</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone на %s се провали (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Синхорнизация на файл с данни</translation> </message> @@ -9080,119 +9134,119 @@ Maximum</source> <translation>грешен номер на събитие</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Грешка при разряд на дата и час</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Гмуркане №%d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Грешка при рaзряд на време за гмуркане</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Грешка при рaзряд на максимална дълбочина</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Грешка при рaзряд на температура</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Грешка при рaзряд на газ микс брой</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Грешка при прием на водна соленост</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Грешка при прием на повърхностно налягане</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Грешка при прием на режим на гмуркане</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Грешка при рaзряд на газ микс</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Не може да бъде създаден разряд за %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Грешка при регистриране на данни</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Гмуркане в %s е вече изтеглено</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>модел=%s фирммуер=%u сер.номер=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Грешка при отваряне на у-во %s %s (%s) В повечето случаи за да се направи дебъг на този проблем е необходимо да се изпратят лог файлове на разработчиците. Можете да ги копирате в диалога "За Subsurface".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9202,13 +9256,13 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Няма изтеглени нови гмуркания от леководолазен компютър</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>повече от една GPS локации за това място на гмуркане; също така %s @@ -9216,19 +9270,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>допълнително име за място: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Зареди гмуркания от лакален кеш</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Данните за гмурканията бяха заредни успешно</translation> </message> @@ -9251,12 +9305,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Не може да бъде напревен разбор на '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> @@ -9287,8 +9341,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, ефективно GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>SP промяна</translation> </message> @@ -9550,17 +9604,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>ниска pO₂ стойност %.2f към %d:%02u с газ %s при дълбочина %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9569,84 +9623,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбара </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбара </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Стоп за безопастност: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9655,7 +9709,7 @@ EADD: %d%s / %.1fгр./л. </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9664,175 +9718,175 @@ EADD: %d%s / %.1fгр./л. </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Плъност: %.1fг/л. </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Стоп за безопастност: неопределено време @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: неопр. време @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>В Deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %uмин @ %.0f%s (калк.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>В Deco (калк.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (калк.) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (калк.) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (калк.) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (калк.) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Калкулиран таван %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Тъкан %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD в първа тъкан </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>сърдечен ритъм: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>лагер: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>средна дълбочина до %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02d мин.</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/мин.</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9881,142 +9935,142 @@ EADD: %d%s / %.1fгр./л. <translation>З</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Въздух</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>повече от %1 дни</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n гмуркане (гмуркания))</numerusform><numerusform>(%n гмуркане (гмуркания))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>КИСЛОРОД</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Не може да бъде отворен файл %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Номер</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Време</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Темп. на въздух</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Темп. на водата</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Гмуркания</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Пътувания</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Разширено търсене</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Видимост</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Водач</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Партньор</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> @@ -10027,180 +10081,180 @@ EADD: %d%s / %.1fгр./л. </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Тагове</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Бележки</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Покажи повече детайли</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Година</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Общо време</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Средно време</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Най-кратко време</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Най-дълго време</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Средна дълбочина</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Мин. дълбочина</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Макс. дълбочина</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Средно SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Мин. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Макс. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Средна темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Мин. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Макс. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Назад към списъка</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Гмуркане №</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Гмуркачески профил</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Информация за гмуркане</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Екипировка</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Големина</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Работно налягане</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Начално налягане</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Крайно налягане</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Събития</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Име</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Стойност</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Координати</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Статус на гмуркане</translation> </message> @@ -10230,62 +10284,62 @@ EADD: %d%s / %.1fгр./л. <translation>Всички (според статистики на пътуване)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Ян</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Март</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Юни</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Юли</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Сеп</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Нов</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -10536,12 +10590,17 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>сек.</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Макс. дълбочина:</translation> @@ -10567,77 +10626,77 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Бележки:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Сглобен</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Потънал</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Време за потъване</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Причина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Националност</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Корабостроителница</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Вид на кораб</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Дължина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Теглич</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Течение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Отклонение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Товар</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Данни за останки</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Височина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Дълбочина</translation> </message> @@ -10682,27 +10741,27 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Град</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Започни запис на данни</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Започни запис на гмуркания</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Локален кеш създаден</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Подготовка за запис на данни</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>смяна на режим</translation> </message> @@ -10717,7 +10776,7 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Изтрий тази точка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Не записвай празен регистър в облака</translation> </message> @@ -10737,22 +10796,22 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Максимум</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Грешен отговор от сървъра</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Очакван XML таг 'DiveDateReader', вместо това получен '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Очакван XML таг 'DiveDates' не беше намерен</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Грешен XML отговор. Ред %1: %2</translation> </message> @@ -10765,112 +10824,102 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Списък на гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Менажиране на гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Изключи авто-синхронизиране с облака</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Включи авто-синхронизиране с облака</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Изключи услугата за локализиране</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Ръчно добавяне на гмъркане</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Изтегли от леководолазен компютър</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Ръчна синхронизация с облака</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Изключването на автоматична синхронизация с облака значи запис на данни само локално. Това е много полезно в ситуации без добър интернет. Моля изберете "Ръчна синхронизация с облака" за да синхронизирате данните само при добра възможност.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Помощ</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Качване на GPS данни</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Приложи GPS позиции</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Теглене на GPS данни</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Покажи GPS позиции</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Изчисти GPS кеш</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Регистър на приложението</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Информация за темата</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>За приложението</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Стартирай услугата за локализиране</translation> </message> diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts index a3d02f266..3ff4dad0a 100644 --- a/translations/subsurface_ca.ts +++ b/translations/subsurface_ca.ts @@ -167,160 +167,160 @@ <translation>S'està explorant a la cerca de dispositius remots...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>L'exploració ha finalitzat amb èxit.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>El dispositiu de Bluetooth local era %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>Actiu</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>Inactiu</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>SENSE APARELLAR</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>APARELLAT</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORITZAT_EMPARELLAR</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Estat: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>El dispositiu %1 es pot emprar per a connectar. Podeu prémer el botó «Desa».</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>S'ha d'aparellar amb el dispositiu %1 per a poder-lo emprar. Useu el menú contextual per a les opcions d'aparellament.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Per a una connexió, el dispositiu necessita una adreça que no sigui zero.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>El dispositiu local ha canviat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Aparella</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Elimina l'aparellament</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>S'està provant aparellar amb el dispositiu %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>S'està provant desaparellar amb el dispositiu %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>El dispositiu %1 ha estat desaparellat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>El dispositiu %1 ha estat aparellat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>S'ha aparellat i autoritzat al dispositiu %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>El dispositiu %1 es pot emprar per a connectar. Podeu prémer el botó «Desa».</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Error del dispositiu local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Error en aparellar. Si el dispositiu remot requereix un codi PIN, proveu d'aparellar-los emprant el vostre sistema operatiu.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Error desconegut</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>L'adaptador de Bluetooth està desactivat, activeu-lo abans de reprendre la cerca.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>En escriure o llegir des del dispositiu ha resultat en un error.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>S'ha produït un error desconegut.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Error en cercar dispositius: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>No disponible</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>No es pot accedir a l'adaptador de Bluetooth local.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>No s'ha creat l'agent de cerca de dispositius perquè l'adreça %1 no coincideix amb l'adreça de l'adaptador físic de cap dispositiu de Bluetooth.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Persona:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Cerca per companys i líders de busseig</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Sense companys</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Fes una còpia de seguretat de l'arranjament</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Fitxers de còpia de seguretat</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Error en la còpia de seguretat de l'XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>S'ha produït un error mentre es desava el fitxer de la còpia de seguretat. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Còpia de seguretat correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>S'ha desat el vostre arranjament a: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Restableix l'arranjament de l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Error en restaurar l'XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>S'ha produït un error mentre es restaurava el fitxer de la còpia de seguretat. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Restauració correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>El vostre arranjament s'ha restaurat correctament.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Selecciona un fitxer de microprogramari</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Fitxers de registre</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>S'està connectant amb el dispositiu...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Connectat amb el dispositiu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Desconnectat del dispositiu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Tria un fitxer per a fer de registre de la baixada des de l'ordinador de busseig</translation> </message> @@ -1851,7 +1851,7 @@ <message> <location filename="../qt-models/cylindermodel.cpp" line="262"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> - <translation>Calculat emprant la preferència pO₂ inferior. Establint els ajustaments MOD del percentatge de O₂, ajustat a «*» per al millor percentatge de O₂ per a la profunditat màxima.</translation> + <translation>Calculat emprant la preferència pO₂ inferior. Establint els ajustaments MOD del percentatge d'O₂, ajustat a «*» per al millor percentatge d'O₂ per a la profunditat màxima.</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="265"/> @@ -1973,22 +1973,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Detalls de la immersió</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Suprimeix la immersió</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Cancel·la l'edició</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Mostra al mapa</translation> </message> @@ -1996,104 +1996,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Immersió %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Ubicació:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordenades:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Ubica la posició GPS actual:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Profunditat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Durada:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temp. de l'aire:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temp. de l'aigua:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Vestit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Company:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Líder de busseig:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Llast:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Ampolla:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Cilindre1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Barreja de gas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Pressió inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Pressió final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Cilindre2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Cilindre3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Cilindre4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Cilindre5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Valoració:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibilitat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notes:</translation> </message> @@ -2262,104 +2294,119 @@ GPS actual:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandeix-ho tot</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Redueix-ho tot</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Redueix les altres</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Elimina la/es immersió/ns del viatge</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Crea un nou viatge per sobre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Afegeix una/es immersió/ns al viatge de sobre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Afegeix una/es immersió/ns al viatge de sota</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Combina un viatge amb el viatge de sobre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Combina un viatge amb el viatge de sota</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Suprimeix la/es immersió/ns</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marca la/es immersió/ns com a no vàlida/es</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Fusiona les immersions seleccionades</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Torna a numerar la/es immersions</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Desplaça l'hora de la immersió</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Divideix les immersions seleccionades</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Carrega la/es imatge/s des de fitxer/s</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Carrega la imatge des del web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Fitxers d'imatge (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Obre fitxers de suport</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 no aparenta ser una imatge</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Fitxers de suport</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Fitxers d'imatge</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Obre els fitxers d'imatge</translation> + <source>Video files</source> + <translation>Fitxers de vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Tots els fitxers</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 no aparenta ser una imatge</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS actual:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Llum</translation> </message> @@ -2570,123 +2617,123 @@ GPS actual:</translation> <translation>Sorra</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Format genèric que s'empra per a l'intercanvi de dades entre programes relacionats amb el busseig.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valors separats per comes que descriuen el perfil de busseig.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valors separats per comes de la informació del busseig. Aquí s'inclouen la majoria dels detalls però no la informació sobre el perfil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Envia les dades de busseig al lloc web «divelogs.de».</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Envia les dades de busseig a la pàgina web dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exporta els llocs d'immersió a HTML, visualitzant-los en un mapa mundial.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Format en XML natiu del Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Escriu la profunditat de les imatges als fitxers.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Escriu la immersió com a macros de TeX en un fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exporta el fitxer UDDF com a</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>Fitxers UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>Fitxers en CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>Fitxers en HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>Fitxers en TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exporta el fitxer CSV com a</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exporta al mapamundi</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exporta a l'XML del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Desa la profunditat de les imatges</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exporta a un fitxer TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exporta els fitxers HTML com a</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Espereu un moment, mentre s'exporta...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>No s'ha pogut obrir el fitxer %s</translation> </message> @@ -3046,62 +3093,62 @@ majoria dels detalls però no la informació sobre el perfil.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>Desconeguda</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>cil.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Profunditat final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Temps acumulat</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gas emprat</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>Punt d'ajust amb CC</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Mode de busseig</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Temps de parada</translation> </message> @@ -3307,260 +3354,266 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Núm.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Valoració</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Profunditat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Llast</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Vestit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Ampolla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>SNC màx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Etiquetes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotografies</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Suport</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Company</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Ubicació</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Llast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotografies abans/durant/ després de la immersió</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Suport abans/durant/després de la immersió</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>No s'ha seleccionat cap immersió</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>No s'ha trobat el full d'estils per exportar a «divelogs.de»</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>Ha fallat en crear el fitxer ZIP per publicar: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>Error intern</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Ha fallat la conversió de la immersió %1 al format del «divelogs.de»</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>Error en escriure el fitxer ZIP: error ZIP %s, error del sistema %d «%d - %s»</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Fet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>S'està publicant la llista de les immersions…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>S'està baixant la llista de les immersions…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>S'estan baixant %1 immersions…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Baixada finalitzada - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problema amb la baixada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>L'arxiu no s'ha pogut obrir:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Baixada corrompuda</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>L'arxiu no s'ha pogut obrir: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>La publicació ha finalitzat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Ha fallat la publicació</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Publicació correcta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Ha fallat l'accés</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>No s'ha pogut interpretar la resposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3568,23 +3621,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Baixa</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Tria el mode de baixada Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>S'està connectant amb l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Error</translation> </message> @@ -3594,42 +3647,47 @@ p, li { white-space: pre-wrap; } <translation>Troba l'ordinador de busseig Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Troba l'ordinador de busseig Garmin</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Cancel·la la baixada</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Tria un fitxer per a fer de registre de la baixada des de l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Fitxers de registre</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Tria un fitxer pel bolcat binari des de l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Fitxers de bolcat</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Reprèn la baixada</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Avís</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>S'està desant el bolcat de «libdivecomputer», això NO baixarà les immersions a la llista d'immersions.</translation> @@ -3702,9 +3760,9 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Baixa</translation> </message> @@ -3730,7 +3788,7 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> @@ -3745,57 +3803,63 @@ a la llista d'immersions.</translation> <translation>El bluetooth no està habilitat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation> Nom del venedor: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>Dispositiu USB</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Ordinador de busseig:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Connexió:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Torna a intentar-ho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Surt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Torna a explorar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Immersions baixades</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Informació:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Selecciona-ho tot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Desselecciona-ho tot</translation> </message> @@ -3826,12 +3890,12 @@ a la llista d'immersions.</translation> <translation>Connecta amb el marcador de posició de text de Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Per a desconnectar el Subsurface del vostre compte al Facebook, empreu l'entrada de menú «Comparteix».</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Per a connectar amb Facebook, inicieu una sessió. Això permetrà al Subsurface publicar les immersions al vostre historial</translation> </message> @@ -3839,22 +3903,22 @@ a la llista d'immersions.</translation> <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>S'ha accedit al Facebook amb èxit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, ID d'usuari desconegut, no s'ha pogut accedir.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>S'ha publicat la immersió al Facebook amb èxit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Ha fallat la publicació de la immersió. Vegeu la sortida de depuració i envieu-la a la llista de correu del Subsurface</translation> </message> @@ -3870,17 +3934,17 @@ a la llista d'immersions.</translation> <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Selecciona-ho tot</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Desselecciona-ho tot</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inverteix la selecció</translation> </message> @@ -3935,18 +3999,18 @@ a la llista d'immersions.</translation> <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Troba les imatges mogudes</translation> + <source>Find moved media files</source> + <translation>Troba els fitxers se suport moguts</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Imatges trobades</translation> + <source>Found media files</source> + <translation>Fitxers de suport trobats</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Coincideix només amb les imatges en la/es immersió/ons seleccionada/es</translation> + <source>Match only media files in selected dive(s)</source> + <translation>Coincideix només amb els fitxers de suport a la/es immersió/ons seleccionada/es</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3961,8 +4025,8 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Travessa els directoris amb imatges</translation> + <source>Traverse media directories</source> + <translation>Atravesa els directoris de suports</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3972,22 +4036,22 @@ a la llista d'immersions.</translation> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation>S'ha cancel·lat l'xploració -els resultats poden estar incomplets-</translation> + <translation>S'ha cancel·lat l'exploració -els resultats poden estar incomplets-</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>No s'ha trobat cap imatge coincident</translation> + <source>No matching media files found</source> + <translation>No s'ha trobat cap fitxer de suport coincident</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>S'han trobat <b>%1</b> imatges al seu lloc actual.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation>S'han trobat <b>%1</b> fitxers de suport al lloc actual.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>S'han trobat <b>%1</b> imatges a les noves ubicacions:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation>S'han trobat %1 fitxers de suport als llocs nous.</translation> </message> </context> <context> @@ -4079,40 +4143,40 @@ a la llista d'immersions.</translation> <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Ubicació: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Ubicació</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (mateixa posició GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 de distància</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n immersions aquí)</numerusform><numerusform>, %n immersió aquí)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(no hi ha dades GPS existents, s'afegeix la posició GPS d'aquesta immersió)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(sense dades GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Tria un lloc:</translation> </message> @@ -4120,7 +4184,7 @@ a la llista d'immersions.</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Sense ubicació</translation> </message> @@ -4245,8 +4309,8 @@ Segur que voleu continuar?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -4267,19 +4331,19 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temp. de l'aire</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temp. de l'aigua</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Ubicació</translation> </message> @@ -4360,8 +4424,8 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotografies</translation> + <source>Media</source> + <translation>Suport</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4394,53 +4458,53 @@ Segur que voleu continuar?</translation> <translation>Afegeix un sistema de llast</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temp. de l'aire [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temp. de l'aigua [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Aquest viatge s'està editant.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>S'estan editant múltiples immersions.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Aquesta immersió s'està editant.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Notes del viatge</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Ubicació del viatge</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Punt d'immersió nou</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Descarto els canvis?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Esteu a punt de descartar els vostres canvis.</translation> </message> @@ -4473,424 +4537,419 @@ Segur que voleu continuar?</translation> <translation>&Importa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Edita</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Comparteix</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>Diari &nou</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nou</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Obre un diari</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Obre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>De&sa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Desa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Desa &com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Desa com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Tan&ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Tanca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Im&primeix</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&referències</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Surt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importa des de l'or&dinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importa les dades &GPS del servei web de Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Edita els &noms dels dispositius</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Afegeix una immersió</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Edita la immersió</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copia els components de la immersió</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>En&ganxa els components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>To&rna a numerar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>A&grupa automàticament</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Estadístiques an&uals</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Llista &d'immersions</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Informació</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Tot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Ordinador de busseig ante&rior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Ordinador de busseig següe&nt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Quant al Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manual d'usuari</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Mapa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanifica una immersió</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importa fitxers de registre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importa fitxers de diari de busseig des d'altres aplicacions</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importa &des de «divelogs.de»</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Pa&ntalla completa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Commuta la pantalla completa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Comprova si hi ha actualitzacions</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exporta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exporta els diaris de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configura l'or&dinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Edita la i&mmersió en el planificador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Commuta el graf del pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Commuta el graf del pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Commuta el graf del pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Commuta el sostre informat per l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Commuta el sostre calculat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Commuta el càlcul de tots els teixits</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Commuta el sostre calculat amb increments de 3 m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Commuta el ritme cardíac</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Commuta el PMO</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Commuta el PEA, PNE i EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Commuta el LND, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Commuta el ritme CAS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Commuta la regla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Escala el graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Commuta les fotografies</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Commuta el suport</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>Troba els fitxers de suport moguts</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Commuta la barra del gas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtra la llista de les immersions</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Commuta el graf de calor dels teixits</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Enquesta d'u&suari</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Desfés</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Refés</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Troba les imatges mogudes</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Obre &l'emmagatzematge al núvol</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Desa a l'emmagatzematge al &núvol</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Gestiona els punts d'immersió</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Edita un punt d'immersió</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Connecta a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Desconnecta de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'obrir un altre fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Obre un fitxer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Avís</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>S'estan intentant fusionar les immersions amb un interval d'entre %1 min.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>S'ha creat una còpia de seguretat de la plantilla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4913,214 +4972,214 @@ plantilles predeterminades són de només lectura i no s'han d'editar directament, ja que l'aplicació les pot sobreescriure quan s'inicia.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'estar en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Teniu canvis sense desar. Els voleu publicar a l'emmagatzematge al núvol? Si responeu no, el núvol només se sincronitzarà en la següent crida a «Obre l'emmagatzematge en el núvol» o «Desa a l'emmagatzematge en el núvol».</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Ha fallat en posar l'emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans de tancar el fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'intentar afegir-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Imprimeix la taula del temps acumulat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>S'està intentant tornar a planificar una immersió que encara havia estat planificada.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Si us plau, finalitzeu l'edició actual abans d'intentar fer-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Estadístiques anuals</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Fitxers del diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>Fitxers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>Visor del registre de l'APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voleu desar els canvis que heu fet en el fitxer %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voleu desar els canvis que heu fet en el fitxer de dades?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Deso els canvis?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Si sortiu sense desar, els canvis es perdran.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Desa el fitxer com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[cau local per a] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[emmagatzematge al núvol de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>S'està obrint el fitxer de dades d'una versió anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Has obert un fitxer de dades d'una versió anterior del Subsurface. Recomanem llegir el manual per aprendre sobre els canvis en la nova versió, especialment la gestió dels punts d'immersió que ha variat significativament. El Subsurface ja ha intentat omplir les dades, però potser valdrà la pena perdre un moment en donar una ullada al nou sistema per a la gestió dels punts d'immersió, per assegurar-vos que tot està correcte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Obre un fitxer de diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>S'està contactant amb el servei al núvol...</translation> </message> @@ -5177,7 +5236,7 @@ Podrien faltar els mòduls QtPositioning i QtLocation del QML!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>El filtratge mostra %1 (de %2) immersions</translation> </message> @@ -5185,12 +5244,12 @@ Podrien faltar els mòduls QtPositioning i QtLocation del QML!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Hauríeu d'actualitzar el microprogramari de l'ordinador de busseig: La versió actual és %1, però l'última versió estable és %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5199,27 +5258,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a baixar un diari, abans de continuar amb l'actualització</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Ara no</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Actualitza el microprogramari</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Avís d'actualització del microprogramari</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Desa el microprogramari baixat com a</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Fitxers de microprogramari</translation> </message> @@ -5357,8 +5416,8 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Sense fitxer per omissió</translation> + <source>&No default file</source> + <translation>Se&nse fitxer predeterminat</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5382,6 +5441,7 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5412,29 +5472,54 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Miniatures dels vídeos</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>Executable de «ffmpeg»</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Extreu a la posició</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Extreu les miniatures del vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Neteja tots els ajustaments</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Restableix tots els ajustaments als seus valors predeterminats</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Obre el fitxer de registre per omissió</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Selecciona l'executable de «ffmpeg»</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5589,8 +5674,8 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Torna a calcular les miniatures si són més antigues que la imatge</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Torna a calcular les miniatures si són més antigues que els fitxers de suport</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5629,7 +5714,7 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <translation>Mostra la profunditat mitjana en el perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -5708,27 +5793,27 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <translation>Per a carregar correctament un nou idioma, haureu de reiniciar el Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Aquestes s'usaran tal qual. Potser, això no sigui el que volíeu. Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caràcters literals</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Caràcter/s no especial/s al format de temps. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Caràcter/s no especial/s al format de la data. @@ -5780,7 +5865,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Emmagatzematge al núvol del Subsurface</translation> </message> @@ -5805,73 +5890,58 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Deso localment la contrasenya?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Servei web del Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID per omissió de l'usuari</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Deso localment l'ID d'usuari?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Xarxa</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Sense intermediari</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Servidor intermediari del sistema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Servidor intermediari HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Servidor intermediari SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El canvi s'ha ignorat. El correu electrònic i la contrasenya de l'emmagatzematge en el núvol només poden consistir en lletres, números i «.», «-», «_» i «+».</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> - <translation>El canvi s'ha ignorat. El correu electrònic i la contrasenya noves de l'emmagatzematge en el núvol només poden consistir en lletres, números i «.», «-», «_» i «+».</translation> + <translation>El canvi s'ha ignorat. El correu electrònic i la contrasenya nova de l'emmagatzematge en el núvol només poden consistir en lletres, números i «.», «-», «_» i «+».</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correu i la contrasenya de l'emmagatzematge en el núvol només pot contenir lletres, números i els caràcters «.», «-», «_» i «+».</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Emmagatzematge al núvol del Subsurface (credencials verificades)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Emmagatzematge al núvol del Subsurface (contrasenya incorrecta)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Emmagatzematge al núvol del Subsurface (cal el PIN)</translation> </message> @@ -6200,133 +6270,133 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (núm. %1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Ordinador de busseig desconegut</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Mostrar la LND / TTS ha estat inhabilitat per un temps de procès excessiu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Afegeix un canvi de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Crea el primer ordinador de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Immersió planificada</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Immersió afegida manualment</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Suprimeix aquest ordinador de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (amp. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Afegeix un canvi de punt d'ajust</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Afegeix una adreça d'interès</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Divideix en dos la immersió</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Canvia el mode de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Edita el perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Elimina l'esdeveniment</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Oculta els esdeveniments similars</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Edita el nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusta la pressió de l'ampolla %1 (actualment interpolada com %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Revela tots els esdeveniments</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Oculta els esdeveniments</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Oculto tots els esdeveniments %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Elimino l'esdeveniment seleccionat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Edita el nom de l'adreça d'interès</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Nom personalitzat:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>El nom és massa llarg!</translation> </message> @@ -6334,53 +6404,53 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>S'està començant...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Obre un fitxer de dades de busseig local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Ha fallat en obrir el fitxer de dades local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>S'han carregat %1 immersions des del fitxer de dades de busseig local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>Es treballa en el mode sense el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Error en analitzar l'emmagatzematge local i s'abandona</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Sense les credencials del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Introduïu unes credencials vàlides pel núvol.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correu i la contrasenya de l'emmagatzematge en el núvol només pot contenir lletres, números i els caràcters «.», «-», «_» i «+».</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Format no vàlid per a l'adreça de correu electrònic</translation> </message> @@ -6430,50 +6500,50 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <translation>No s'ha pogut connectar amb l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Les credencials del núvol són vàlides, s'estan carregant les immersions...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Error amb l'emmagatzematge al núvol: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>S'estan carregant les immersions des de l'emmagatzematge local («Mode sense el núvol»)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ha fallat en connectar amb el servidor en el núvol, no s'ha rebut l'estat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>L'emmagatzematge al núvol s'ha obert amb èxit. No hi ha immersions a la llista de busseig.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Ubicació GPS desconeguda</translation> </message> @@ -6481,7 +6551,7 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>S'està començant...</translation> </message> @@ -6573,116 +6643,126 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Ajustaments</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Sense definir</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>La combinació, nom d'usuari/contrasenya és incorrecta</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Cal verificar les credencials</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>S'han verificat les credencials</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Mode sense el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Estat del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Correu-e</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>No aplicable</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Canvia</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Estat</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blau</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>Text normal</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Ressaltat</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Fosc</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Servei web de dades del Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Llindar de la distància (metres)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Llindar del temps (minuts)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Cilindre predeterminat</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Ampolla:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Desenvolupador</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Mostra el menú del desenvolupador</translation> </message> @@ -6717,16 +6797,16 @@ Exporteu aquesta plantilla a un fitxer diferent.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Avís! -No totes les imatges tenen marques de temps en l'interval entre minuts abans del -començament i 30 minuts després del final de qualsevol de les immersions seleccionades.</translation> +No tots els fitxers multimèdia tenen marques de temps a l'interval entre +30 minuts abans de l'inici i 30 minuts després del final de qualsevol immersió seleccionada.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Carrega les imatges encara que l'hora no coincideixi amb l'hora de la immersió</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Carrega els fitxers de suport fins i tot si el temps no coincideix amb el temps de la immersió</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6749,39 +6829,39 @@ començament i 30 minuts després del final de qualsevol de les immersions selec <translation>Quina data i hora es mostren a la imatge?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Obre un fitxer d'imatge</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Fitxers d'imatge</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Data/hora de la immersió seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Primer la data/hora de la immersió seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Últim la data/hora de la immersió seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Fitxers amb una data/hora inapropiada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>No s'ha trobat cap data/hora Exif</translation> </message> @@ -6874,28 +6954,28 @@ Fitxers amb una data/hora inapropiada</translation> <translation>Importa els missatges (errors, avisos, etc.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Obre els fitxers del SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>Fitxers del SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Obre fitxers del Subsurface</translation> </message> @@ -6903,61 +6983,61 @@ Fitxers amb una data/hora inapropiada</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Petit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mitja</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data de la immersió: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durada: %1</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Lloc de la immersió: %1</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Company: %1</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Líder de busseig: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7094,65 +7174,17 @@ Fitxers amb una data/hora inapropiada</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Introduïu l'ID de l'usuari i feu clic a «Baixa»</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Servei web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>S'està connectant...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Baixada finalitzada</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Error durant la baixada: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Error durant la connexió:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>L'identificador d'usuari no és vàlid.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>No s'ha pogut interpretar la resposta!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Baixada correcta</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Combinacions:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>No s'ha establert cap vestit</translation> </message> @@ -7283,39 +7315,44 @@ Fitxers amb una data/hora inapropiada</translation> <translation>Nivell de zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Carrega la/es imatge/s des de fitxer/s</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Carrega la/es imatge/s des del web</translation> + <source>Load media from file(s)</source> + <translation>Carrega el/s suport/s des de fitxer/s</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Suprimeix les imatges seleccionades</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Carrega el/s suport/s des del web</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Suprimeix totes les imatges</translation> + <source>Delete selected media files</source> + <translation>Suprimeix els fitxers de suport seleccionats</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Suprimeix tots els fitxers de suport</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Obre la carpeta dels fitxers de suport seleccionats</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Torna a calcular les miniatures seleccionades</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Eliminació de les imatges</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>S'estan suprimint els fitxers de suport</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Esteu segur que voleu suprimir totes les imatges?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Segur que voleu suprimir tots els fitxers de suport?</translation> </message> </context> <context> @@ -7482,15 +7519,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Etiquetes: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Etiquetes</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Etiquetes buides</translation> </message> @@ -7689,7 +7726,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1feu clic per a visitar %2</translation> </message> @@ -7713,130 +7750,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 visibles)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Núm.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Valoració</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Ampolla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>SNC màx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Etiquetes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Suport abans/durant/després de la immersió</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Company</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Llast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Vestit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotografies abans/durant/ després de la immersió</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Ubicació</translation> </message> @@ -7850,81 +7892,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Introduïu l'URL per a les imatges</translation> + <source>Enter URL for media files</source> + <translation>Introduïu un URL per als fitxers de suport</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Comprovació de si hi ha actualitzacions.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>El Subsurface no ha pogut comprovar les actualitzacions.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Ha succeït el següent error:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Si us plau, comproveu la connexió a internet.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Esteu emprant l'última versió del Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Hi ha disponible una nova versió del Subsurface.<br/>Feu clic a:<br/><a href="%1">%1</a><br/> per a baixar-la.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Hi ha disponible una nova versió del Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>L'última versió és %1, si us plau, comproveu %2 a la nostra pàgina de baixades %3 per a informar-vos sobre com actualitzar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>La versió més recent és</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>El servidor ha retornat la següent informació:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>El Subsurface comprovarà cada dues setmanes si hi ha disponible una nova versió. Si no voleu qu continui fent-ho, feu clic a «Declina».</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Declina</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Comprova automàticament si hi ha actualitzacions</translation> </message> @@ -8100,6 +8142,19 @@ Idioma: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>L'«ffmpeg» ha fallat en iniciar: s'ha suspès la creació de les miniatures de vídeo</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>Ha fallat en esperar l'«ffmpeg»: s'ha suspès la creació de les miniatures de vídeo</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8155,12 +8210,12 @@ Idioma: %1</translation> <translation>Publica</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>L'operació ha excedit el temps</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>S'estan transferint les dades...</translation> </message> @@ -8186,8 +8241,8 @@ Idioma: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Cap error</translation> </message> @@ -8311,7 +8366,7 @@ Màxim</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Error en analitzar la capçalera</translation> </message> @@ -8648,9 +8703,9 @@ Màxim</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxigen</translation> </message> @@ -8665,131 +8720,131 @@ Màxim</translation> <translation>Circuit obert</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>aire</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrat</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>cinturó</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>turmell</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>llast al darrere</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>amb clips</translation> </message> @@ -8852,13 +8907,13 @@ Màxim</translation> <message> <location filename="../core/import-csv.c" line="705"/> <source>O₂ calibration failed</source> - <translation>Ha fallat el calibratge de O₂</translation> + <translation>Ha fallat el calibratge de l'O₂</translation> </message> <message> <location filename="../core/import-csv.c" line="707"/> <location filename="../core/import-csv.c" line="716"/> <source>O₂ calibration</source> - <translation>Calibratge de O₂</translation> + <translation>Calibratge de l'O₂</translation> </message> <message> <location filename="../core/import-csv.c" line="235"/> @@ -8866,123 +8921,123 @@ Màxim</translation> <translation>No s'ha trobat cap perfil de la immersió a «%s»</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Obtén des de l'emmagatzematge (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transfereix des de l'emmagatzematge (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transfereix a l'emmagatzematge (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>El directori del cau local %s està corrupte -no s'ha pogut sincronitzar amb l'emmagatzematge en el núvol de Subsurface-</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>No s'ha pogut actualitzar el cau local amb les noves dades remotes</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>L'emmagatzematge en el núvol de Subsurface està corrupte</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>No s'ha pogut actualitzar l'emmagatzematge en el núvol de Subsurface, proveu-ho més tard</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>L'emmagatzematge remot i local de les dades són diferents. Error: ha fallat en fusionar (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>L'emmagatzematge remot i local de les dades són diferents. No es poden combinar els canvis locals i remots</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>L'emmagatzematge remot i local de les dades són diferents.</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>L'emmagatzematge remot i local de les dades són diferents. Error: ha fallat en escriure les dades (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemes amb el cau local de les dades al núvol de Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>S'han mogut les dades de la memòria cau a %s. Si us plau, proveu de nou l'operació.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Actualitza l'emmagatzematge local per a fer-lo coincidir amb l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Entrega els canvis locals a l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Intenta fussionar els canvis locals en l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Emmagatzema les dades a l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sincronitza amb l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>No s'ha pogut abastar el servidor en el núvol, s'està treballant amb les dades locals</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Connexió amb el núvol exitosa, s'estan recuperant les dades remotes</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>S'ha realitzat la incronització amb l'emmagatzematge en el núvol</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Error en connectar amb l'emmagatzematge en el núvol de Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Ha fallat el «git clone» de %s (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>S'està sincronitzant el fitxer de dades</translation> </message> @@ -9081,119 +9136,119 @@ Màxim</translation> <translation>el número de l'esdeveniment no és vàlid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Error en analitzar la data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Immersió %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Error en analitzar el temps de busseig</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Error en analitzar la profunditat màxima</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Error en llegir la temperatura</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Error en analitzar el contingut de la mescla de gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Error en obtenir la salinitat de l'aigua</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Error en obtenir la pressió en superfície</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Error en obtenir el mode de busseig</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Error en analitzar la mescla de gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>No s'ha pogut crear l'analitzador per a %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Error en enregistrar les dades</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Error en analitzar les mostres</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>La immersió ja s'ha baixat a %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Esdeveniment: s'està a l'espera d'una acció de l'usuari</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s microprogramari=%u sèrie=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Error en enregistrar el manegador d'esdeveniments.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Error en enregistrar el manegador de cancel·lació.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Error en importar les dades de les immersions</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>No s'ha pogut crear un context de «libdivecomputer»</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>No s'ha pogut obrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Error en obrir el dispositiu %s %s (%s). En la majoria dels casos, per a depurar aquest problema, és útil enviar els fitxers del registre als desenvolupadors. Els podeu copiar al porta-retalls des del diàleg «Quant a».</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9202,31 +9257,31 @@ En la majoria dels casos, per a depurar aquest problema, serà útil un fitxer d Podeu crear aquest fitxer de registre seleccionant la casella de selecció corresponent al diàleg de baixada.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>No hi ha cap immersió nova baixada des de l'ordinador de busseig</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>múltiples posicions GPS per aquest lloc d'immersió; també %s</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>nom addicional per aquest lloc: %s</translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Carrega les immersions des del cau local</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>S'han obert amb èxit les dades de busseig</translation> </message> @@ -9248,12 +9303,12 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>Percentatge estrany en llegir %s</translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Ha fallat en analitzar «%s»</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>No s'ha pogut obrir el full d'estil %s</translation> </message> @@ -9284,8 +9339,8 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>, GF=%d/%d efectiu</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Canvi del PA</translation> </message> @@ -9547,17 +9602,17 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>Valor de pO₂ baix %.2f a %d:%02u amb gas %s a la profunditat de %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>No s'ha trobat el gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9566,83 +9621,83 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min. </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>SNC: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada de desco: %u min. @ %.0f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Parada de seguretat: %u min. @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9651,7 +9706,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9660,170 +9715,170 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densitat: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Parada de seguretat: temps desc. @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Parada de desco: temps desc. @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>En descompressió</translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %u min. </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %u min. </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada de desco: %u min. @ %.0f%s (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>En descompressió (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %u min. (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>LND: >2 h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %u min. (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2 h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>TFR: %u min. </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Sostre calculat %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Teixit %.0fmin: %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>CIM en el teixit principal </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>Ritme cardíac: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Orientació: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Prof. mitja fins aquí %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sPres:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s CAS:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9872,142 +9927,142 @@ EADD: %d%s / %.1fg/ℓ <translation>O</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AIRE</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>més de %1 dies</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n immersions)</numerusform><numerusform>(%n immersió)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXIGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>No s'ha pogut obrir el fitxer %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Ubicació</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temp. de l'aire</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temp. de l'aigua</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Immersions</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandeix-ho tot</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Redueix-ho tot</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Viatges</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Estadístiques</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Cerca avançada</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Valoració</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibilitat</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Líder de busseig</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Company</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Vestit</translation> </message> @@ -10018,180 +10073,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Etiquetes</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mostra més detalls</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Estadístiques anuals</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Any</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Temps total</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Durada mitjana</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Durada més curta</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Durada més llarga</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Mitj. de la prof.</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Prof. mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Prof. màxima</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Mitjana del CAS</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>CAS mínim</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>CAS màxim</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temp. mitjana</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temp. mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temp. màxima</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Torna a la llista</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Immersió núm.</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Perfil de la immersió</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informació de la immersió</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Equipament de busseig</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tipus</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Mida</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pressió de treball</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Pressió inicial</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Pressió final</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Llast</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Esdeveniments</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valor</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordenades</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Estat de la immersió</translation> </message> @@ -10221,62 +10276,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Tots (per estadístiques del viatge)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Gen.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> - <translation>Feb.</translation> + <translation>Febr.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Abr.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Ago.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Set.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Des.</translation> </message> @@ -10527,12 +10582,17 @@ Està connectat correctament el Uemis Zurich?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>seg</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>No s'ha trobat una carpeta anomenada «tema» a les ubicacions estàndard</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Prof. màxima:</translation> @@ -10558,77 +10618,77 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Notes:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Construït</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Enfonsat</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Temps enfonsat</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Raó</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nacionalitat</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Drassana</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Tipus d'embarcació</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Llargada</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Mànega</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Calat</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Desplaçament</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Càrrega</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Data de l'enfonsament</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitud</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Profunditat</translation> </message> @@ -10673,27 +10733,27 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Ciutat</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Comença a desar les dades</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Comença a desar les immersions</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>S'ha realitzat la creació del cau local</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>S'està realitzant la preparació per a desar les dades</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>Canvi de mode</translation> </message> @@ -10708,7 +10768,7 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Elimina aquest lloc</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>No desis un registre buit al núvol</translation> </message> @@ -10728,22 +10788,22 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Màxim</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Resposta del servidor no vàlida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>S'esperava l'etiqueta XML «DiveDateReader», s'ha rebut %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>No s'ha trobat l'etiqueta XML esperada «DiveDates»</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Resposta en XML amb format incorrecte. Línia %1: %2</translation> </message> @@ -10756,112 +10816,102 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Llista d'immersions</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Gestió de la immersió</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Inhabilita la sincronització automàtica amb el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Habilita la sincronització automàtica amb el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Inhabilita el servei d'ubicació</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Ajustaments</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Afegeix una immersió manualment</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Baixa des de l'ordinador de busseig</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Sincronitza manualment amb el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Desactivar la sincronització automàtica amb el núvol fa que totes les dades només es puguin emmagatzemar localment. Això pot ser molt útil en situacions amb accés limitat o sense la xarxa. Si us plau, seleccioneu «Sincronitza manualment amb el núvol» si teniu connectivitat a la xarxa i voleu sincronitzar les vostres dades amb l'emmagatzematge en el núvol.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Publica les dades del GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Aplica les correccions del GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Baixa les dades del GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Mostra les correccions del GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Neteja el cau del GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Desenvolupador</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Registre de l'aplicació</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informació sobre el tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Quant a</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Executa el servei d'ubicació</translation> </message> diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index 481ef0865..a643761b4 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -33,7 +33,7 @@ <message> <location filename="../mobile-widgets/qml/About.qml" line="62"/> <source>Copy logs to clipboard</source> - <translation type="unfinished"/> + <translation>Kopírovat záznamy do schránky</translation> </message> </context> <context> @@ -167,160 +167,160 @@ <translation>Hledají se vzdálená zařízení...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Hledání úspěšně dokončeno.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Místní Bluetooth zařízení bylo %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>zapnuto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>vypnuto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>NESPÁROVÁNO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>SPÁROVÁNO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>SPÁROVÁNO_S_AUTORIZACÍ</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Stav: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Zařízení %1 může být použito pro připojení. Můžete stisknout tlačítko Uložit.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Zařízení %1 musí být pro použití spárováno. Použijte prosím kontextovou nabídku pro možnosti párování.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Zařízení potřebuje pro spojení nenulovou adresu.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Místní zařízení bylo změněno.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Dvojice</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Odebrat spárování</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Pokus o spárování zařízení %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Pokus o zrušení spárování zařízení %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Zařízení %1 nebylo spárováno.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Zařízení %1 bylo spárováno.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Zařízení %1 bylo spárováno a je autorizováno.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Zařízení %1 nyní může být použito pro připojení. Můžete stisknout tlačítko Uložit.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Chyba místního zařízení: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Chyba párování. Pokud vzdálené zařízení vyžaduje PIN, zkuste, prosím, zařízení spárovat ve vašem operačním systému.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Neznámá chyba</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetooth adaptér je odpojen, před vyhledáváním jej zapojte.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Zapisování do nebo čtení ze zařízení skončilo chybou.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Vyskytla se neznámá chyba.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Chyba při vyhledávání zařízení: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Nedostupné</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Nelze přistupovat k lokálnímu Bluetooth adaptéru.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Vyhledávací agent zařízení nebyl vytvořen, protože adresa %1 neodpovídá žádné fyzické adrese Bluetooth adaptéru.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Osoba:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Hledání buddy a divemasterů</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Žádný buddy</translation> </message> @@ -580,7 +580,7 @@ <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> <source>Sample setpoint</source> - <translation>Setpoint vzorku</translation> + <translation>Požadovaná hodnota vzorku</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> @@ -1378,7 +1378,7 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3434"/> <source>Setpoint</source> - <translation>Setpoint</translation> + <translation>Požadovaná hodnota</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1105"/> @@ -1438,7 +1438,7 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3473"/> <source>Fixed setpoint</source> - <translation>Fixní setpoint</translation> + <translation>Pevná požadovaná hodnota</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2413"/> @@ -1449,7 +1449,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/> <source>Setpoint fallback</source> - <translation>Záložní hodnota setpointu</translation> + <translation>Záložní hodnota požadované hodnoty</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1168"/> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Nastavení záložního potápěčského počítače</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Záložní soubory</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Chyba zálohy XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Chyba při ukládání záložního souboru. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Záloha úspěšně vytvořena</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Nastavení bylo uloženo do: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Obnovit nastavení potápěčského počítače</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Chyba obnovy XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Chyba při obnově záložního souboru. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Obnova úspěšně proběhla</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Vaše nastavení bylo úspěšně obnoveno.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Vyberte soubor s firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Všechny soubory</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Log soubory</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Připojování k zařízení...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Připojeno k zařízení</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Odpojeno od zařízení</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Vyberte log soubor stahování z potápěčského počítače</translation> </message> @@ -1972,22 +1972,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Podrobnosti ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Smazat ponor</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Zrušit změny</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Zobrazit na mapě</translation> </message> @@ -1995,104 +1995,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Ponor %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Lokalita:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Souřadnice:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Použít nynější GPS polohu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Hloubka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Trvání:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Zátěž:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Lahev:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Láhev 1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Směs plynu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Počáteční tlak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Koncový tlak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Láhev 2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Láhev 3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Láhev 4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Láhev 5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Hodnocení:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Viditelnost:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> @@ -2261,104 +2293,119 @@ GPS polohu:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Rozbalit vše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Sbalit vše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Sbalit ostatní</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Odstranit ponor(y) z výletu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Vytvořit nový výlet výše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Přidat ponor(y) k výletu výše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Přidat ponor(y) k výletu níže</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Sloučit výlet s výletem výše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Sloučit výlet s výletem níže</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Smazat ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Označit ponor(y) jako neplatné</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Sloučit vybrané ponory</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Přečíslovat ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Posunout časy ponoru</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Rozdělit vybrané ponory</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Nahrát obrázek(y) ze souboru(ů)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Nahrát obrázek z webu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Soubory s obrázky (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Otevřít soubory se záznamy</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 se nezdá být obrázkem</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Soubory se záznamy</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Soubory s obrázky</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Otevřít soubory s obrázky</translation> + <source>Video files</source> + <translation>Videosoubory</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Všechny soubory</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 se nezdá být obrázkem</translation> </message> </context> <context> @@ -2379,17 +2426,17 @@ GPS polohu:</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/> <source>Export dive log files</source> - <translation>Exportovat soubory potápěčského deníku</translation> + <translation>Uložit soubory potápěčského deníku</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/> <source>General export</source> - <translation>Obecný export</translation> + <translation>Obecné uložení</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/> <source>Export format</source> - <translation>Formát exportu</translation> + <translation>Formát uložení</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/> @@ -2485,7 +2532,7 @@ GPS polohu:</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/> <source>Export yearly statistics</source> - <translation>Exportovat roční statistiky</translation> + <translation>Uložit roční statistiky</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/> @@ -2495,12 +2542,12 @@ GPS polohu:</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/> <source>Export list only</source> - <translation>Exportovat pouze seznam</translation> + <translation>Uložit pouze seznam</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/> <source>Export photos</source> - <translation>Exportovat fotografie</translation> + <translation>Uložit fotografie</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/> @@ -2559,7 +2606,7 @@ GPS polohu:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Světlý</translation> </message> @@ -2569,121 +2616,121 @@ GPS polohu:</translation> <translation>Pískový</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Obecný formát používaný pro výměnu dat mezi různými potápěčskými programy.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Čárkou oddělené hodnoty popisující profil ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Čárkou oddělené hodnoty informací o ponoru. Zahrnuje většinu podrobností ponoru, ale ne informaci o profilu.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Odeslat data ponoru na stránky divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Odeslat data ponoru na stránky dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> - <translation>HTML export potápěčských lokalit, zobrazených na mapě světa.</translation> + <translation>Uložení potápěčských lokalit do HTML, zobrazených na mapě světa.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Vlastní XML formát programu Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Zapsat hloubky pořízení obrázků do souboru.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Zapsat ponor jako TeX makra do souboru.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> - <translation>Exportovat UDDF soubor jako</translation> + <translation>Uložit soubor UDDF jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF soubory</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV soubory</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML soubory</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface soubory</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX soubory</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> - <translation>Exportovat CSV soubor jako</translation> + <translation>Uložit soubor CSV jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> - <translation>Exportovat mapu světa</translation> + <translation>Uložit mapu světa</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> - <translation>Exportovat Subsurface XML</translation> + <translation>Uložit Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Uložit hloubky pořízení obrázku</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> - <translation>Exportovat do TeX souboru</translation> + <translation>Uložit do souboru TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> - <translation>Exportovat HTML soubory jako</translation> + <translation>Uložit soubor HTML jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> - <translation>Čekejte, prosím, exportuje se...</translation> + <translation>Čekejte, prosím, ukládá se...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Nelze otevřít soubor %s</translation> </message> @@ -2693,7 +2740,7 @@ GPS polohu:</translation> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="14"/> <source>Import dive log file</source> - <translation>Importovat soubor potápěčského deníku</translation> + <translation>Náhrát soubor potápěčského deníku</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/> @@ -2828,7 +2875,7 @@ GPS polohu:</translation> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/> <source>Sample setpoint</source> - <translation>Setpoint vzorku</translation> + <translation>Požadovaná hodnota vzorku</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/> @@ -3043,62 +3090,62 @@ GPS polohu:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>lahev</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Koncová hloubka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Čas konce</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Použitý plyn</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> - <translation>CC setpoint</translation> + <translation>Požadovaná hodnota CC</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Režim potápění</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Zastavit časy</translation> </message> @@ -3206,7 +3253,7 @@ GPS polohu:</translation> <message> <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> - <translation>Setpoint</translation> + <translation>Požadovaná hodnota</translation> </message> <message> <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> @@ -3303,261 +3350,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Číslo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Hloubka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Zátěž</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Lahev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Plyn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Štítky</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotografie</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Záznamy</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Stát</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Partner</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Hloubka (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Teplota (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Zátěž (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>Spotřeba plynu (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotografie před/během/po ponoru</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Záznamy před/během/po ponoru</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>nebyly vybrány žádné ponory</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> - <translation>nebyl nalezen styl pro export do divelogs.de</translation> + <translation>nebyl nalezen styl pro uložení do divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>nepodařilo se vytvořit soubor s archivem ve formátu zip pro nahrání: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>vnitřní chyba</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Převod ponoru %1 do formátu divelogs.de selhal</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>chyba zápisu zip souboru: %s zip chyba %d systémová chyba %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Hotovo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Nahrává se seznam ponorů...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Stahuje se seznam ponorů...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Stahování %1 ponorů...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Stahování dokončeno - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problém se stahováním</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Archiv nelze otevřít: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Poškozené stahování</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Archiv se nepodařilo otevřít: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Nahrávání dokončeno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Nahrávání selhalo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Nahrávání uspěšně dokončeno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Přihlášení se nezdařilo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Odpověď nelze zpracovat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> @@ -3565,23 +3618,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Stáhnout</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Vybrat režim Bluetooth stahování</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Připojování k potápěčskému počítači</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -3591,42 +3644,47 @@ p, li { white-space: pre-wrap; } <translation>Najít potápěčský počítač Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Najít potápěčský počítač Garmin</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Zrušit stahování</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Vyberte soubor .log stahování z potápěčského počítače</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Log soubory</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Vyberte soubor pro binární dump potápěčského počítače</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Vypsat soubory</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Opakovat stahování</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Varování</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Uložení libdivecomputer dumpu NEstáhne ponory do seznamu ponorů.</translation> </message> @@ -3698,9 +3756,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Stáhnout</translation> </message> @@ -3726,7 +3784,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -3741,57 +3799,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth není povolen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Název prodejce: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>Zařízení USB</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Potápěčský počítač:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Připojení:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Opakovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Prohledat znovu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Stažené ponory</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Označit vše</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Odznačit vše</translation> </message> @@ -3822,12 +3886,12 @@ p, li { white-space: pre-wrap; } <translation>Připojení na Facebook zástupný text</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Pro odpojení Subsurface od Facebook účtu použijte nabídku „Sdílení“.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Pro připojení k Facebooku se, prosím, přihlašte. Tím Subsurface umožníte vaše ponory zveřejnit na vaší časové ose.</translation> </message> @@ -3835,22 +3899,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Přihlášení Facebooku úspěšné</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Chyba, neznámé uživatelské ID, nelze se přihlásit.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Nahrání ponoru na Facebook úspěšné</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Nahrání ponoru selhalo. Podívejte se prosím na debugovací výstup a zašlete jej do poštovní konference Subsurface</translation> </message> @@ -3866,17 +3930,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Označit vše</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Odznačit vše</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Obrátit výběr</translation> </message> @@ -3931,59 +3995,59 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation type="unfinished"/> + <source>Find moved media files</source> + <translation>Nalézt přesunuté soubory se záznamy</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation type="unfinished"/> + <source>Found media files</source> + <translation>Nalezené soubory se záznamy</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation type="unfinished"/> + <source>Match only media files in selected dive(s)</source> + <translation>Porovnat pouze soubory se záznamy ve vybraných potápěních</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> <source>Scanning:</source> - <translation type="unfinished"/> + <translation>Prohledává se</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> <source>Select folder and scan</source> - <translation type="unfinished"/> + <translation>Vybrat složku a prohledat</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Procházet adresáře obrázků</translation> + <source>Traverse media directories</source> + <translation>Procházet adresáře záznamů</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> <source>Stop scanning</source> - <translation type="unfinished"/> + <translation>Zastavit prohledávání</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation type="unfinished"/> + <translation>Prohledávání zrušeno - výsledky nemusí být úplné</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation type="unfinished"/> + <source>No matching media files found</source> + <translation>Nenalezeny žádné odpovídající soubory se záznamy</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation type="unfinished"/> + <source>Found <b>%1</b> media files at their current place.</source> + <translation>Nalezeno <b>%1</b> souborů se záznamy v jejich nynějším umístění.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation type="unfinished"/> + <source>Found <b>%1</b> media files at new locations:</source> + <translation>Nalezeno <b>%1</b> souborů se záznamy v nových umístěních:</translation> </message> </context> <context> @@ -4056,7 +4120,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../core/gpslocation.cpp" line="135"/> <source>Unknown GPS location (no GPS source)</source> - <translation type="unfinished"/> + <translation>Neznámá poloha GPS (žádný zdroj GPS)</translation> </message> </context> <context> @@ -4075,40 +4139,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Lokalita: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Lokalita</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(stejná GPS pozice)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 pryč</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n ponor(ů) zde)</numerusform><numerusform>, %n ponor(ů) zde)</numerusform><numerusform>, %n ponor(ů) zde)</numerusform><numerusform>, %n ponor(ů) zde)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(žádná existující GPS data, přidat GPS pozici z tohoto ponoru)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(žádná GPS data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Vyberte lokalitu:</translation> </message> @@ -4116,7 +4180,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Není nastavena žádná lokalita</translation> </message> @@ -4241,8 +4305,8 @@ Jste si jisti, že chcete pokračovat?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -4263,19 +4327,19 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Lokalita</translation> </message> @@ -4356,8 +4420,8 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotografie</translation> + <source>Media</source> + <translation>Záznamy</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4390,53 +4454,53 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Přidat zátěž</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Teplota vzduchu [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Teplota vody [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Tento výlet je upravován.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Je upravováno více ponorů.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Tento ponor je upravován.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Poznámky k výletu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Lokalita výletu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nová potápěčská lokalita</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Zahodit změny?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Chystáte se zahodit změny.</translation> </message> @@ -4466,427 +4530,422 @@ Jste si jisti, že chcete pokračovat?</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> - <translation>&Import</translation> + <translation>&Náhrát</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>Úp&ravy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Sdílení</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Nový deník</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nový</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Otevřít deník</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Uložit &jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Uložit jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Zavřít</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Tisk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>&Nastavení</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Ukončit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> - <translation>Importovat z potápěčského počítače</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importovat &GPS data z webu Subsurface</translation> + <translation>Náhrát z potápěčského počítače</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Upravit zařízení a &názvy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Přidat ponor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Upravit ponor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Kopírovat data ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Vložit data ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Přečíslovat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>&Seskupit automaticky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Roční statistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>S&eznam ponorů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Informace</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Vše</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>&Předchozí potápěčský počítač</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Následující potápěčský počítač</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&O programu Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Uživatelská &příručka</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Mapa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>&Naplánovat ponor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> - <translation>&Importovat log soubory</translation> + <translation>&Náhrát log soubory</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> - <translation>Importovat soubory potápěčského deníku z jiné aplikace</translation> + <translation>Náhrát soubory potápěčského deníku z jiné aplikace</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> - <translation>Importovat &z divelogs.de</translation> + <translation>Náhrát &z divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Celá obrazovka</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Přepnout zobrazení na celou obrazovku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Zkontrolovat aktualizace</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> - <translation>&Exportovat</translation> + <translation>&Uložit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> - <translation>Exportovat potápěčský deník</translation> + <translation>Uložit potápěčský deník</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Nastavit potápěčský počítač</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>&Upravit ponor v plánovači</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Zobrazit pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Zobrazit pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Zobrazit pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Zobrazit strop vypočtený potápěčských počítačem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Zobrazit vypočtený strop</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Zobrazit výpočet všech tkání</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Zobrazit vypočtený strop s 3m nárůstky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Zobrazit tepovou frekvenci</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Zobrazit MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Zobrazit EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Zobrazit NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Zobrazit SAC rate (rychlost spotřeby plynu)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Zobrazit pravítko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Změnit velikost grafu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Zobrazit obrázky</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Zobrazit záznamy</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>&Nalézt přesunuté soubory se záznamy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Zobrazit pruh plynů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrovat seznam ponorů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Zobrazit heat mapu tkání</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Uživatelský průzkum</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Zpět</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Znovu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Nalézt přesunuté obrázky</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Otevřít &serverové úložiště</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>&Uložit na serverové úložiště</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Správa potápěčských lokalit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Upravení potápěčské lokality</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Serverové úložiště online.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Připojit k</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Odpojit od</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Před otevřením nového souboru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Otevřít soubor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Varování</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Pokus o sloučení ponorů s %1 min intervalem mezi nimi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Záloha šablony vytvořena</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4909,214 +4968,214 @@ pouze pro čtení a neměly by být přímo editovány, protože aplikace je může při startu přepsat.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Před online připojením prosím uložte nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Máte neuložené změny. Chcete je odeslat na serverové úložiště? Pokud odpovíte ne, serverové úložiště bude synchronizováno pouze při příštím volání "Otevřít serverové úložiště" nebo "Uložit do serverového úložiště".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Chyba online připojení serverového úložiště.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Před zavřením souboru přosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Před přidáním ponoru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Vypsat tabulku koncových časů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Pokus o přeplánování ponoru, který není plánem ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Před prováděním dalších úprav dokončete stávající úpravy.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Soubory potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Soubory Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI soubory</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>Prohlížeč záznamů APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Všechny soubory</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chcete uložit změny provedené v souboru %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chcete uložit změny provedené v souboru s daty?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Uložit změny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Změny budou ztraceny, pokud je neuložíte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Uložit soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[místní vyrovnávací paměť pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[serverové úložiště pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Otevírání datového souboru ze starší verze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Otevřeli jste datový soubor starší verze Subsurface. Doporučujeme vám přečíst příručku, abyste zjistili změny v nové verzi, zvláště o správě potápěčských lokalit, která se značně změnila. Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se na systém nové správy potápěčských lokalit a ujistit se, že vše vypadá správně.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Otevřít soubor potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Spojení se serverovou službou...</translation> </message> @@ -5172,7 +5231,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filtr zobrazuje %1 (z(e) %2) ponoru(ů)</translation> </message> @@ -5180,12 +5239,12 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Měli byste aktualizovat firmware vašeho potápěčského počítače: máte verzi %1, ale poslední stabilní verze je %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5194,27 +5253,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako pro stažení deníku před pokračováním aktualizace</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Teď ne</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Aktualizovat firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Upozornění aktualizace firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Uložit stažený firmware jako</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Soubory firmware</translation> </message> @@ -5352,8 +5411,8 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Žádný výchozí soubor</translation> + <source>&No default file</source> + <translation>Žá&dný výchozí soubor</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5377,6 +5436,7 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5407,29 +5467,54 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Náhledy na videa</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>Spustitelný soubor ffmpeg</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Vytáhnout v poloze</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Vytáhnout náhledy na videa</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Smazat všechna nastavení</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Nastavit všechna nastavení na jejich výchozí hodnoty</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Obecné</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Otevřít výchozí log soubor</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Soubory Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Vybrat spustitelný soubor ffmpeg</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5550,27 +5635,27 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="138"/> <source>Dive planner default setpoint</source> - <translation>Výchozí setpoint plánovače ponorů</translation> + <translation>Výchozí požadovaná hodnota plánovače ponorů</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/> <source>Show O₂ sensor values when viewing pO₂</source> - <translation type="unfinished"/> + <translation>Zobrazit hodnoty senzoru O₂ při zobrazení pO₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/> <source>Show CCR setpoints when viewing pO₂</source> - <translation type="unfinished"/> + <translation>Zobrazit požadované hodnoty CCR při zobrazení pO₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/> <source>pSCR metabolic rate O₂</source> - <translation type="unfinished"/> + <translation>pSCR rychlost látkové výměny O₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/> <source>Show equivalent OC pO₂ with pSCR pO₂</source> - <translation type="unfinished"/> + <translation>Ukázat ekvivalent OC pO₂ s pSCR pO₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/> @@ -5584,8 +5669,8 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation type="unfinished"/> + <source>Recalculate thumbnails if older than media file</source> + <translation>Přepočítat náhledy, pokud jsou starší než soubor se záznamem</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5624,7 +5709,7 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <translation>Zobrazit střední hodnotu hloubky v profilu</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5703,27 +5788,27 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <translation>Pro nahrání nového jazyka je nutno restartovat program Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Tyto budou použity tak, jak jsou. To nemusel být váš záměr. Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Doslovné znaky</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Ne-speciální znak(y) ve formátu času. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Ne-speciální znak(y) ve formátu data. @@ -5775,7 +5860,7 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Serverové úložiště Subsurface</translation> </message> @@ -5800,73 +5885,58 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Uložit heslo lokálně?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Webová služba Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Výchozí ID uživatele</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Uložit ID uživatele lokálně?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Síť</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Žádná proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Systémová proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Změna ignorována. E-mail a heslo k serverovému úložišti mohou obsahovat pouze písmena, číslice a '.', '-', '_', '+'. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Změna ignorována. E-mail a nové heslo k serverovému úložišti mohou obsahovat pouze písmena, číslice a '.', '-', '_', '+'. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mail a heslo k serverovému úložišti mohou obsahovat pouze písmena, čísla a '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Serverové úložiště Subsurface (přístupové údaje ověřeny)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Serverové úložiště Subsurface (neplatné heslo)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Serverové úložiště Subsurface (je vyžadován PIN)</translation> </message> @@ -6132,12 +6202,12 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../desktop-widgets/printoptions.ui" line="141"/> <source>Export</source> - <translation>Export</translation> + <translation>Uložení</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="148"/> <source>Import</source> - <translation>Import</translation> + <translation>Náhrání</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> @@ -6152,12 +6222,12 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>The template '%1' is read-only and cannot be edited. Please export this template to a different file.</source> <translation>Šablona '%1' je pouze pro čtení a nemůže být editována. -Exportujte prosím šablonu do jiného souboru.</translation> +Uložte, prosím, šablonu do jiného souboru.</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> - <translation>Importovat soubor šablony</translation> + <translation>Náhrát soubor šablony</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="149"/> @@ -6174,7 +6244,7 @@ Exportujte prosím šablonu do jiného souboru.</translation> <message> <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> - <translation>Exportovat soubory šablon jako</translation> + <translation>Uložit soubory šablon jako</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="219"/> @@ -6195,133 +6265,133 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Neznámý potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>NDL / TTS nebylo zobrazeno kvůli příliš dlouhému času zpracování</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Přidat změnu plynu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>První potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Plánovaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Ručně přidaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Smazat tento potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (lahev %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> - <translation>Přidat změnu setpointu</translation> + <translation>Přidat změnu požadované hodnoty</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Přidat záložku</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> - <translation type="unfinished"/> + <translation>Rozdělit ponor do dvou</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> - <translation type="unfinished"/> + <translation>Změnit režim ponoru</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Editovat profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Odstranit událost</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Skrýt podobné události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Upravit název</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Upravit tlak v lahvi %1 (v současnosti interpolován jako %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Zrušit skrytí všech událostí</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Skrýt události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Skrýt všech %1 událostí?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Odstranit vybranou událost?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Upravit název záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Vlastní název:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Název je příliš dlouhý!</translation> </message> @@ -6329,53 +6399,53 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Spouštění...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Otevřít místní soubor s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Otevřít místní soubor s daty se nepodařilo</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 ponorů nahráno z místního souboru s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>režim práce bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Chyba při zpracování místního úložiště. Vzdává se</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>žádné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Prosím zadejte platné přístupové údaje k serveru.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mail a heslo k serverovému úložišti mohou obsahovat pouze písmena, čísla a '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Neplatný formát pro adresy elektronické pošty</translation> </message> @@ -6425,50 +6495,50 @@ Exportujte prosím šablonu do jiného souboru.</translation> <translation>Nelze se připojit k serverovému úložišti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Přihlašovací údaje k serveru platné. Nahrávají se ponory...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Chyba serverového úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Nahrávají se ponory s místního úložiště (režim žádný server)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Selhalo připojení k serveru, návrat ke stavu bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Serverové úložiště úspěšně otevřeno. Žádné ponory v seznamu.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Neznámá GPS pozice</translation> </message> @@ -6476,7 +6546,7 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Spouštění...</translation> </message> @@ -6552,12 +6622,12 @@ Exportujte prosím šablonu do jiného souboru.</translation> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> <source>Add setpoint change</source> - <translation>Přidat změnu setpointu</translation> + <translation>Přidat změnu požadované hodnoty</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> <source>New setpoint (0 for OC)</source> - <translation>Nový setpoint (0 pro otevřený sytém)</translation> + <translation>Nová požadovaná hodnota (0 pro otevřený systém)</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="61"/> @@ -6568,116 +6638,126 @@ Exportujte prosím šablonu do jiného souboru.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Nastavení</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Nedefinováno</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Neplatná kombinace uživatelského jména a hesla</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Je nutno ověřit přístupové údaje</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Přístupové údaje ověřeny</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Režim bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Stav serveru</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-mail</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Neplatné</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Změna</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Vzhled</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Modrá</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>regulární text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Zvýraznění</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Růžová</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Tmavá</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS webová služba</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Práh vzdálenosti (metry)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Práh času (minuty)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Výchozí lahev</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Lahev:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Vývojář</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Zobrazit vývojářskou nabídku</translation> </message> @@ -6712,16 +6792,16 @@ Exportujte prosím šablonu do jiného souboru.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Varování! -Ne všechny obrázky mají čas mezi +Ne všechny soubory se záznamy mají čas mezi 30 minutami před začátkem a 30 minutami po konci vybraného ponoru.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Nahrát obrázky i pokud jejich čas nesouhlasí s časem ponoru</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Nahrát soubory se záznamy i pokud jejich čas nesouhlasí s časem ponoru</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6744,39 +6824,39 @@ Ne všechny obrázky mají čas mezi <translation>Jaké datum a čas jsou zobrazeny na fotografii?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Otevřít soubor s obrázkem</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Soubory s obrázky</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Čas/Datum vybraného ponoru</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Čas/Datum prvního vybraného ponoru</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Čas/Datum posledního vybraného ponoru</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Soubory se špatným datem/časem</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Nenalezeno žádné datum/čas EXIF</translation> </message> @@ -6830,7 +6910,7 @@ Soubory se špatným datem/časem</translation> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/> <source>SmartTrak files importer</source> - <translation>Importér souborů SmartTrak</translation> + <translation>Náhrávač souborů SmartTrak</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/> @@ -6856,41 +6936,41 @@ Soubory se špatným datem/časem</translation> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/> <source>Import</source> - <translation>Import</translation> + <translation>Nahrání</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/> <source><html><head/><body><p><span style=" font-weight:600; color:#6ebeb9;">Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It's advisable to use a new output file, as its actual content will be erased.</span></p></body></html></source> - <translation><html><head/><body><p><span style=" font-weight:600; color:#6ebeb9;">Vyberte .slg soubor(y), které chcete importovat do Subsurface formátu, a exportovaný .xml soubor. Je doporučeno použít nový výstupní soubor, protože jeho aktuální obsah bude smazán.</span></p></body></html></translation> + <translation><html><head/><body><p><span style=" font-weight:600; color:#6ebeb9;">Vyberte .slg soubor(y), které chcete nahrát do Subsurface formátu, a uložený .xml soubor. Je doporučeno použít nový výstupní soubor, protože jeho aktuální obsah bude smazán.</span></p></body></html></translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> <source>Import messages (errors, warnings, etc)</source> - <translation>Importovat zprávy (chyby, varování, atd.)</translation> + <translation>Náhrát zprávy (chyby, varování, atd.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Otevřít soubory SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak soubory</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Všechny soubory</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Soubory Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Otevřít soubory Subsurface</translation> </message> @@ -6898,64 +6978,64 @@ Soubory se špatným datem/časem</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Malé</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Střední</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Datum ponoru: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Doba trvání: %1 min </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Potápěčská lokalita %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7050,7 +7130,7 @@ Soubory se špatným datem/časem</translation> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud button above.</source> - <translation type="unfinished"/> + <translation>Pro použití Subsurface-mobile se serverovým úložištěm Subsurface, zadejte prosím vaše přihlašovací údaje. <br/><br/> Pokud je to poprvé, kdy využíváte serverové úložiště Subsurface, zadejte platný e-mail (malými písmeny) a heslo dle vašeho výběru (písmena a číslice). <br/><br/> Pro použití Subsurface-mobile pouze s lokálními daty na tomto zařízení, vyberte tlačítko "bez serveru" nahoře.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="50"/> @@ -7092,65 +7172,17 @@ Soubory se špatným datem/časem</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Zadejte ID uživatele a klikněte na Stáhnout</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webová služba</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Připojuje se...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Stahování dokončeno</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Chyba při stahování: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Chyba spojení: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Neplatné označení uživatele!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Odpověď nelze zpracovat!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Stahování se zdařilo</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Obleky:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Není nastaven žádný oblek</translation> </message> @@ -7281,39 +7313,44 @@ Soubory se špatným datem/časem</translation> <translation>Úroveň zvětšení</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Nahrát obrázek(y) ze souboru(ů)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Nahrát obrázek(y) z webu</translation> + <source>Load media from file(s)</source> + <translation>Nahrát záznam(y) ze souboru(ů)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Smazat vybrané obrázky</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Nahrát záznam(y) z internetu</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Smazat všechny obrázky</translation> + <source>Delete selected media files</source> + <translation>Smazat vybrané soubor se záznamy</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Smazat všechny soubor se záznamy</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Otevřít složku vybraných souborů se záznamy</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> - <translation type="unfinished"/> + <translation>Přepočítat vybrané náhledy</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Mazání obrázků</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>Mazání souborů se záznamy</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Opravdu chcete smazat všechny obrázky?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Opravdu chcete smazat všechny soubory se záznamy?</translation> </message> </context> <context> @@ -7480,15 +7517,15 @@ ze vzduchu a následujících plynů:</translation> <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Štítky:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Štítky</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Prázdné štítky</translation> </message> @@ -7687,7 +7724,7 @@ ze vzduchu a následujících plynů:</translation> <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1klik k návštěvě %2</translation> </message> @@ -7697,7 +7734,7 @@ ze vzduchu a následujících plynů:</translation> <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/ToolBarApplicationHeader.qml" line="125"/> <source>More Actions</source> - <translation type="unfinished"/> + <translation>Více činností</translation> </message> </context> <context> @@ -7711,130 +7748,135 @@ ze vzduchu a následujících plynů:</translation> <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 zobrazeno)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Číslo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Hloubka (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Teplota (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Lahev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Štítky</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Záznamy před/během/po ponoru</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Partner</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Hmotnost (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Plyn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotografie před/během/po ponoru</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Stát</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Lokalita</translation> </message> @@ -7848,81 +7890,81 @@ ze vzduchu a následujících plynů:</translation> </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Zadejte URL obrázků</translation> + <source>Enter URL for media files</source> + <translation>Zadejte adresu (URL) souborů se záznamy</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Zkontrolovat aktualizace</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface se nepodařilo najít novou verzi.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Vyskytla se následující chyba:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Prověřte, prosím, vaše internetové připojení.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Používáte nejnovější verzi programu Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Je dostupná nová verze Subsurface.<br/>Klikněte na:<br/><a href="%1">%1</a><br/> pro její stažení.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Je dostupná nová verze Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Nejnovější verze je %1. Podívejte se, prosím, na %2 naši stránku %3 pro informace o aktualizaci.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Poslední vydaná verze je </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Server vrátil následující informace:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface kontroluje každé dva týdny, zda není dostupná nová verze. Pokud nechcete, aby Subsurface pokračoval v kontrole, klikněte na Odmítnout.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Odmítnout</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automatická kontrola aktualizací</translation> </message> @@ -8011,7 +8053,7 @@ Pokud nechcete, aby Subsurface pokračoval v kontrole, klikněte na Odmítnout.< <message> <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> - <translation>Odkud importujete data?</translation> + <translation>Odkud nahráváte data?</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.cpp" line="19"/> @@ -8098,6 +8140,19 @@ Jazyk: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>Nepodařilo se spustit ffmpeg - vytvoření náhledu na video pozastaveno</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>Nepodařilo se dočkat se ffmpeg - vytvoření náhledu na video pozastaveno</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8153,12 +8208,12 @@ Jazyk: %1</translation> <translation>Nahrát</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Operace trvala příliš dlouho</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Probíhá přenos dat...</translation> </message> @@ -8184,8 +8239,8 @@ Jazyk: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Žádná chyba</translation> </message> @@ -8309,7 +8364,7 @@ Průměr</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Chyba při zpracování hlavičky</translation> </message> @@ -8646,9 +8701,9 @@ Průměr</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -8663,131 +8718,131 @@ Průměr</translation> <translation>Otevřený okruh</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation> m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>stop/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>stop/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>libra US</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>vzduch</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrovaný</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>opasek</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>kotník</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>připínací</translation> </message> @@ -8810,7 +8865,7 @@ Průměr</translation> <location filename="../core/file.c" line="210"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> - <translation>Nelze otevřít CSV soubor %s; Použijte dialog pro import souboru</translation> + <translation>Nelze otevřít CSV soubor %s; Použijte dialog pro nahrání souboru</translation> </message> <message> <location filename="../core/file.c" line="325"/> @@ -8820,7 +8875,7 @@ Průměr</translation> <message> <location filename="../core/import-csv.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation>Poseidon import selhal: nelze číst '%s'</translation> + <translation>Nahrání Poseidon selhal: nelze číst '%s'</translation> </message> <message> <location filename="../core/import-csv.c" line="636"/> @@ -8864,123 +8919,123 @@ Průměr</translation> <translation>Nenalezen žádný profil ponoru v '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Stáhnout z úložiště (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Přesunout z úložiště (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Přesunout do úložiště (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Lokální adresář s vyrovnávací pamětí %s je poškozen - nelze synchronizovat se serverovým úložištěm Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Nelze aktualizovat místní vyrovnávací paměť novějšími vzdálenými daty</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Serverové úložiště Subsurface poškozeno</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Nelze aktualizovat serverové úložiště Subsurface, zkuste to později</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Vzdálené úložiště a lokální data se rozcházejí. Chyba: sloučení selhalo (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Vzdálené úložiště a místní data se rozcházejí. Nelze zkombinovat lokální a vzdálené změny</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Vzdálené úložiště a lokální data se rozcházejí</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Vzdálené úložiště a lokální data se rozcházejí. Chyba: zápis dat selhal (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problém s místní vyrovnávací pamětí servervého úložiště Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Data vyrovnávací paměti přesunuta do %s. Prosím zkuste operaci znovu.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Aktualizovat místní úložiště, aby odpovídalo serverovému úložišti</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Protlačit místní změny data do serverového úložiště</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Pokusit se sloučit místní změny data do serverového úložiště</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Uložit data do serverového úložiště</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Seřídit se serverovým úložištěm</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Nelze dosáhnout serveru. Pracuje se s místními daty</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Úspěšně navázáno spojení se serverem. Natáhnout vzdálená data</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Seřízení se serverovým úložištěm dokončeno</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Chyba připojení k serverovému úložišti Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone %s selhal (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Seřizují se datové soubory</translation> </message> @@ -9079,118 +9134,119 @@ Průměr</translation> <translation>neplatné číslo události</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Chyba při zpracování data a času</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Ponor číslo %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Chyba zpracování data a času ponoru</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Chyba zpracování největší hloubky</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Chyba zpracování teploty</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Chyba zpracování počtu dýchacích plynů</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Chyba zpracování salinity vody</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Chyba zpracování tlaku na hladině</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Chyba při získávání potápěčského režimu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Chyba zpracování směsi plynu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nelze vytvořit parser pro %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Chyba registrace dat</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Chyba zpracování vzorků</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Ponor již stažen v %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Událost: Čekání na uživatelský vstup</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Chyba registrování ovladače události.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrování ovladače zrušení.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> - <translation>Chyba importu dat ponoru</translation> + <translation>Chyba nahrání dat ponoru</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Potíže při inicializaci libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Nelze otevřít %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> - <translation type="unfinished"/> + <translation>Chyba při otevírání zařízení %s %s (%s). +Pro odladění této záležitosti je většinou užitečné poslat vývojářům soubory se záznamy. Můžete je zkopírovat do schránky v dialogu O.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9199,13 +9255,13 @@ Pro debugování této záležitosti je většinou užitečný log soubor libdiv Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v stahovacím dialogu.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Z potápěčského počítače nebyl stažen žádný ponor</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>více GPS pozic pro tuto potápěčskou lokalitu; také %s @@ -9213,19 +9269,19 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>dodatečný název lokality: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Nahrát ponory s místní vyrovnávací paměti</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Úspěšně otevřena data ponoru</translation> </message> @@ -9248,12 +9304,12 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Nepodařilo se zpracovat '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Nelze otevřít styl %s</translation> </message> @@ -9284,8 +9340,8 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>, efektivně GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>změna setpointu</translation> </message> @@ -9468,18 +9524,18 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <message> <location filename="../core/plannernotes.c" line="236"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)</source> - <translation type="unfinished"/> + <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar CCR)</translation> </message> <message> <location filename="../core/plannernotes.c" line="243"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s</source> - <translation type="unfinished"/> + <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s %s</translation> </message> <message> <location filename="../core/plannernotes.c" line="309"/> <location filename="../core/plannernotes.c" line="332"/> <source>(SP = %.1fbar CCR)</source> - <translation type="unfinished"/> + <translation>(SP = %.1fbar CCR)</translation> </message> <message> <location filename="../core/plannernotes.c" line="402"/> @@ -9547,17 +9603,17 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>nízká hodnota pO₂ %.2f v %d:%02u s plynem %s v hloubce %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Nelze najít směs %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9566,84 +9622,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Dekomprese: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Bezpečnostní zastávka: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9652,7 +9708,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9661,174 +9717,174 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Hustota: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Bezpečnostní zastávka: neznámý čas @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Dekomprese: neznámý čas @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Dekomprese </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Dekomprese: %umin @ %.0f%s (vypočteno) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Dekomprese (vypočteno) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (vypočteno) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (vypočteno) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (vypočteno) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (vypočteno) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Vypočítaný strop %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tkáně %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>tepová frekvence: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>směr: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Střední hodnota hloubky %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9877,142 +9933,142 @@ EADD: %d%s / %.1fg/ℓ <translation>Z</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>VZDUCH</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>víc než %1 dní</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n ponor)</numerusform><numerusform>(%n ponory)</numerusform><numerusform>(%n ponorů)</numerusform><numerusform>(%n ponorů)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>KYSLÍK</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Nelze otevřít soubor %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Číslo</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Potápění</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Rozbalit vše</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Sbalit vše</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Výlety</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistiky</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Pokročilé hledání</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Viditelnost</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Partner</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Oblek</translation> </message> @@ -10023,180 +10079,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Štítky</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Ukázat podrobnosti</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Rok</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Celkový čas</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Průměrný čas</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Nejkratší čas</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Nejdelší čas</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Průměrná hloubka</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Nejmenší hloubka</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Největší hloubka</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Průměrná SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Nejmenší SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Největší SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Průměrná teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Nejmenší teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Největší teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Zpět na seznam</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Číslo ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Profil ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informace o ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Potápěčská výstroj</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pracovní tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Počáteční tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Koncový tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Plyn</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Zátěž</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Událost</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Název</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Hodnota</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Souřadnice</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Status ponoru</translation> </message> @@ -10226,62 +10282,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Vše (dle statistik výletu)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>led</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>úno</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>bře</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>dub</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>kvě</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>čer</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>čec</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>srp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>zář</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>říj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>pro</translation> </message> @@ -10532,12 +10588,17 @@ Je Uemis Zurich správně zapojen?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>s</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>V běžných umístěních nelze najít složku s názvem vzhled</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Největší hloubka:</translation> @@ -10563,77 +10624,77 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Poznámky:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Vyrobeno</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Potopeno</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Čas potopení</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Důvod</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Národnost</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Loděnice</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Typ lodě</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Délka</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Maximální šířka na čáře ponoru</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Ponor</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Výtlak</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Náklad</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Data vraku</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Nadmořská výška</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Hloubka</translation> </message> @@ -10678,29 +10739,29 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Město</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Začít ukládat data</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Začít ukládat ponory</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Vytvoření místní vyrovnávací paměti dokončeno</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Připravuje se uložit data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> - <translation type="unfinished"/> + <translation>změna režimu</translation> </message> <message> <location filename="../core/gpslocation.h" line="14"/> @@ -10713,7 +10774,7 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Odstranit tento bod</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Neukládat prázdný log do serveru</translation> </message> @@ -10733,22 +10794,22 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Největší</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Neplatná odpověď serveru</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Byl očekáván XML tag 'DiveDateReader', místo toho nalezeno '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Očekávaný XML tag 'DiveDates' nenalezen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Špatný formát XML odpovědi. Řádek %1: %2</translation> </message> @@ -10761,112 +10822,102 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Seznam potápění</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Správa potápění</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> - <translation type="unfinished"/> + <translation>Zakázat automatickou synchronizaci se serverem</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Povolit automatickou synchronizaci se serverem</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Zakázat lokalizační službu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Nastavení</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Ručně přidat ponor</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Stáhnout z potápěčského počítače</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Ruční synchronizace se serverem</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Vypnutí automatické synchronizace se serverem způsobí uložení všech dat pouze lokálně. To může být velmi užitečné v situacích s omezeným nebo žádným přístupem k síti. Zvolte prosím "Ručně synchronizovat se serverem" pokud máte síťové připojení a chcete synchronizovat data se serverovým úložištěm.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Nahrát GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Použít GPS pozice</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Stáhnout GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Zobrazit GPS pozice</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Vyčistit vyrovnávací paměť GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Vývojář</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Aplikační záznam</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informace tématu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>O</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Spustit lokalizační službu</translation> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 3c7a6ea3d..f56de54d8 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -11,7 +11,8 @@ <location filename="../mobile-widgets/qml/About.qml" line="37"/> <source>A mobile version of the free Subsurface divelog software. </source> - <translation type="unfinished"/> + <translation>en mobil fri version af subsurface divelog programmet +</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="38"/> @@ -24,12 +25,13 @@ © Subsurface developer team 2011-2018</source> - <translation type="unfinished"/> + <translation>Vesrsion: %1 +2011-2018</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="62"/> <source>Copy logs to clipboard</source> - <translation type="unfinished"/> + <translation>Kopier log til klipbord</translation> </message> </context> <context> @@ -45,7 +47,7 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/> <source>Remote Bluetooth device selection</source> - <translation type="unfinished"/> + <translation>Fjern valg af bluetooth enhed</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> @@ -68,22 +70,22 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> <source>Bluetooth mode</source> - <translation type="unfinished"/> + <translation>Bluetooth funktion</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> <source>Auto</source> - <translation type="unfinished"/> + <translation>Automatisk</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> <source>Force LE</source> - <translation type="unfinished"/> + <translation>Forcer LE</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> <source>Force classical</source> - <translation type="unfinished"/> + <translation>Forcer klassisk</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> @@ -155,7 +157,7 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> - <translation type="unfinished"/> + <translation>Liste af eksterne enheder var ikke slettet</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="189"/> @@ -163,160 +165,160 @@ <translation>Skanner for enheder....</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Skanning afsluttet med succes.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> - <translation type="unfinished"/> + <translation>Den lokale Bluetooth enhed var %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>Tændt</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>Slukket</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PARIED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheden %1 kan bruges til forbindelse. Du kan trykke på GEM knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheden %1 skal parres før den kan bruges. Brug venligst contekst menuen for parrings muligheder.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Den lokale enhed blev ændret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Pair</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Ophæv parring</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Forsøger at parre enheden %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Forsøger at ophæve parringen med %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> - <translation type="unfinished"/> + <translation>Enhed %1 var parret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> - <translation type="unfinished"/> + <translation>Enhed %1 er parret og autoriseret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> - <translation type="unfinished"/> + <translation>Lokal enhed fejl: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Ukendt fejl</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> - <translation type="unfinished"/> + <translation>Ukendt fejl er opstået</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> - <translation type="unfinished"/> + <translation>Enhed genkendelses fejl: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> - <translation type="unfinished"/> + <translation>Ikke tilgængelig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +326,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Person:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Søger efter makkere og divemasters</translation> </message> @@ -337,7 +339,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Ingen makkere</translation> </message> @@ -360,7 +362,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/> <source>Cloud credentials</source> - <translation type="unfinished"/> + <translation>Sky akkreditiver</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/> @@ -395,7 +397,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Ingen sky modus</translation> </message> </context> <context> @@ -1224,12 +1226,12 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/> <source>OSTC Mk2/2N/2C</source> - <translation type="unfinished"/> + <translation>OSTC Mk2/2N/2C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/> <source>OSTC 2/3/Sport/Plus/cR</source> - <translation type="unfinished"/> + <translation>OSTC 2/3/Sport/Plus/cR</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="506"/> @@ -1405,7 +1407,7 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3509"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3525"/> <source>cbar</source> - <translation type="unfinished"/> + <translation>cbar</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/> @@ -1658,102 +1660,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Backup af dykker computer indstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Bakupfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML backup fejl</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Det opstod en fejl under skrivning af backup fil: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup færdig med succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Dine indstillinger er gemt til: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Gendan dykker computer indstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML gendannelses fejl</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>En fejl opstod under indlæsning af backup file %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Gendannet med succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Dine indstillinger er blevet gendannet med succes.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Vælg firmware fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Logfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> - <translation type="unfinished"/> + <translation>Forbundet til enhed...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> - <translation type="unfinished"/> + <translation>Forbundet til enhed</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> - <translation type="unfinished"/> + <translation>Forbindelse afbrudt fra enhed</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1763,7 +1765,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> - <translation type="unfinished"/> + <translation>Aktioner</translation> </message> </context> <context> @@ -1807,7 +1809,7 @@ <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>Deco switch at</source> - <translation type="unfinished"/> + <translation>Dekompr. skift ved</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> @@ -1817,7 +1819,7 @@ <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>MND</source> - <translation type="unfinished"/> + <translation>MND</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> @@ -1969,22 +1971,22 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Dykdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Fortryd reigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Vis på kort</translation> </message> @@ -1992,104 +1994,136 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Dyk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Lokation:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Brug nuværende GPS-position</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Varighed:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Luft temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Vand temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Flaske:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gasblaninding:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Starttryk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Sluttryk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Sigtbarhed:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Noter:</translation> </message> @@ -2172,17 +2206,17 @@ GPS-position</translation> <message> <location filename="../profile-widget/diveeventitem.cpp" line="188"/> <source>ICD</source> - <translation type="unfinished"/> + <translation>ICD</translation> </message> <message> <location filename="../profile-widget/diveeventitem.cpp" line="189"/> <source>ΔHe</source> - <translation type="unfinished"/> + <translation>ΔHe</translation> </message> <message> <location filename="../profile-widget/diveeventitem.cpp" line="190"/> <source>ΔN₂</source> - <translation type="unfinished"/> + <translation>ΔN₂</translation> </message> <message> <location filename="../profile-widget/diveeventitem.cpp" line="211"/> @@ -2242,7 +2276,7 @@ GPS-position</translation> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="350"/> <source>Cloud credentials</source> - <translation type="unfinished"/> + <translation>Sky akkreditiver</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="357"/> @@ -2252,110 +2286,125 @@ GPS-position</translation> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="382"/> <source>No dives in dive list</source> - <translation type="unfinished"/> + <translation>Ingen dyk i dyk listen</translation> </message> </context> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Udvid alt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Skjul alle</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Saml andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Fjern dyk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Opret ny tur over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Tilføj dyk umiddelbart over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Tilføj dyk umiddelbart under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Flet tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Flet tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marker dyk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Flet valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Gen-Numerer dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> - <translation type="unfinished"/> + <translation>Skift dyk tider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Opdel valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> + <translation>hent billed(er) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> + <translation>Hent billed fra internet</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Åben billed filer</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Alle filer</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 ser ikke ud til at være et billede</translation> </message> </context> <context> @@ -2401,7 +2450,7 @@ GPS-position</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/> <source>di&velogs.de</source> - <translation type="unfinished"/> + <translation>di&velogs.de</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/> @@ -2426,12 +2475,12 @@ GPS-position</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/> <source>TeX</source> - <translation type="unfinished"/> + <translation>TeX</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/> <source>I&mage depths</source> - <translation type="unfinished"/> + <translation>Billede dybder</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/> @@ -2487,7 +2536,7 @@ GPS-position</translation> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/> <source>All di&ves</source> - <translation type="unfinished"/> + <translation>Alle dyk</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/> @@ -2556,7 +2605,7 @@ GPS-position</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Lys</translation> </message> @@ -2566,121 +2615,121 @@ GPS-position</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Basis format bruges til udveksling af data mellem diverse dykker relaterede programmer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Komma separerede værdier som beskriver profiler.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Komma separerede værdier over dyk informationen. Disse indeholder de fleste dyk detaljer men ingen profil information.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send data til divelog.de hjemmeside</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> - <translation type="unfinished"/> + <translation>Send dyk data til dive-share.appspot.com hjemmeside.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML eksport af dykker lokationer, vist på kortet</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface originale XML format</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> - <translation type="unfinished"/> + <translation>Skriv dybde af billeder til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> - <translation type="unfinished"/> + <translation>Skriv dyk som TeX makroer til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF fil som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> - <translation type="unfinished"/> + <translation>UDDF filer</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> - <translation type="unfinished"/> + <translation>CSV filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> - <translation type="unfinished"/> + <translation>HTML filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> - <translation type="unfinished"/> + <translation>Subsurface filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> - <translation type="unfinished"/> + <translation>TeX filer</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Eksporter CSV fil som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Eksporter verdens kort</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> - <translation type="unfinished"/> + <translation>Gem billed dybder</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> - <translation type="unfinished"/> + <translation>Eksport til TeX fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exporter HTML filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Vent, eksporterer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Kan ikke åbne filen %s</translation> </message> @@ -3009,27 +3058,27 @@ GPS-position</translation> <message> <location filename="../desktop-widgets/diveplanner.ui" line="131"/> <source>Water type</source> - <translation type="unfinished"/> + <translation>Vand type</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="180"/> <source>Fresh water</source> - <translation type="unfinished"/> + <translation>Fersk vand</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="185"/> <source>Sea water</source> - <translation type="unfinished"/> + <translation>Salt vand</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="190"/> <source>EN13319</source> - <translation type="unfinished"/> + <translation>EN13319</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="195"/> <source>Custom</source> - <translation type="unfinished"/> + <translation>Tilpasning</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="221"/> @@ -3040,64 +3089,64 @@ GPS-position</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Slut dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Brugt gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Dykker tilstand</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> - <translation type="unfinished"/> + <translation>Stop tider</translation> </message> </context> <context> @@ -3290,266 +3339,277 @@ GPS-position</translation> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Oxygen-Sans'; font-size:7pt; font-weight:600; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></source> - <translation type="unfinished"/> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Oxygen-Sans'; font-size:7pt; font-weight:600; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></translation> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> - <translation type="unfinished"/> + <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotos</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Makker</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Lokation</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> - <translation type="unfinished"/> + <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Vægt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>ingen dyk var valgt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>Kunne ikke danne zip fil til upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>Intern fejl</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Færdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Uploader dyk liste...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Downloader dyk liste...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Downloader %1 dyk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Download færdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problem med download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> - <translation type="unfinished"/> + <translation>Arkivet kunne ikke åbnes: +</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Fejl i download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne i åbnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Upload færdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Upload fejlede</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Uploadet med succes</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Login fejlede</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Kan ikke fortolke svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Fejl: %1</translation> </message> @@ -3557,23 +3617,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> - <translation type="unfinished"/> + <translation>Vælg modus for Blueetooth hentning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Fejl</translation> </message> @@ -3583,42 +3643,47 @@ p, li { white-space: pre-wrap; } <translation>Find Uemis dykker computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Logfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> - <translation type="unfinished"/> + <translation>Gentag hentning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <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> @@ -3671,7 +3736,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/> <source>Choose Bluetooth download mode</source> - <translation type="unfinished"/> + <translation>Vælg modus for Blueetooth hentning</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/> @@ -3690,9 +3755,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Download</translation> </message> @@ -3718,7 +3783,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Fortryd</translation> </message> @@ -3730,60 +3795,66 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/> <source>Bluetooth is not enabled</source> - <translation type="unfinished"/> + <translation>Bluetooth er ikke aktiveret</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Priducent:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Dykkercomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Prøv igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Downloadrede dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Vælg alle:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Fravælg alle</translation> </message> @@ -3814,12 +3885,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3827,22 +3898,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3858,17 +3929,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Vælg alle:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Fravælg alle</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3898,7 +3969,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/listfilter.ui" line="60"/> <source>¬</source> - <translation type="unfinished"/> + <translation>¬</translation> </message> </context> <context> @@ -3923,17 +3994,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3949,7 +4020,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3964,17 +4035,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4067,40 +4138,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Sted:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Placering</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(Samme GPS-punkt)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 væk</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Vælg lokation:</translation> </message> @@ -4108,7 +4179,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Stedet er ikke sat</translation> </message> @@ -4232,8 +4303,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Noter</translation> </message> @@ -4254,19 +4325,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Luft temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Vand temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Position</translation> </message> @@ -4333,7 +4404,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/> <source>Extra Info</source> - <translation type="unfinished"/> + <translation>Ekstra information</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> @@ -4347,8 +4418,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotos</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4381,53 +4452,53 @@ p, li { white-space: pre-wrap; } <translation>Tilføj vægt system</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Luft temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Vand temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Turen er ved at blive rettet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Flere dyk bliver rettet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Dette dyk bliver rettet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Tur notater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Tur lokation</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Drop ændringerne?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Du er ved at droppe dine ændringer.</translation> </message> @@ -4460,424 +4531,419 @@ p, li { white-space: pre-wrap; } <translation>&Importer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Rediger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Del</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Ny logbog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Åben logbog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Åben</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Gem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Gem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Ge&m som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Gem som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Luk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Luk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>I&ndstillinger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Afslut</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importer fra &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importer &GPS data fra Subsurface webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Rediger enhedsnavne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Tilføj dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Rediger dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Kopier dykker komponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Indsæt dyk komponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Re-Nummerer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Auto &grupering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Årlig statistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Dykker liste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Alt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Fo&rige DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Næste DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Om Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>&Planlæg dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importer logfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importer dykkerlog fra andre programmer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importer fra divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Fuld skærm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Skift fuld skærm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Tjek for opdateringer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Eksporter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exporter dykker logs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Konfigurer &Dykker computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>pO₂graf fra/til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>pN₂ graf fra/til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Skift pH2 graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Skift DC rapporteret loft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Skift beregnet loft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Skift beregning af alle væv</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skift beregnet loft med 3m stop</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Skift hjerte frekvens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Skift MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Skift EAD,END,EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Skift NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Skift SAC rate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Skift måler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Skaler graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Billeder fra/til</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrer dykliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Bruger &undersøgelse</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Fortryd</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> - <translation type="unfinished"/> + <translation>Forbind til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> - <translation type="unfinished"/> + <translation>Afbryd fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Åben fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4891,212 +4957,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Gem eller fortryd venligst denne rettelse før du lukker filen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Print runtime skema</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Færdiggør denne rettelse inden du starter på en ny.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Årlig statistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> - <translation type="unfinished"/> + <translation>Dyk log filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> - <translation type="unfinished"/> + <translation>Subsurface filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> - <translation type="unfinished"/> + <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> - <translation type="unfinished"/> + <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> - <translation type="unfinished"/> + <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> - <translation type="unfinished"/> + <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du gemme ændringerne du foretog på denne fil %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du gemme ændringerne du foretog på data filen?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Ændringer vil blive tabt hvis du ikke gemmer dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5152,7 +5218,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filtrer visning %1(af %2) dyk</translation> </message> @@ -5160,39 +5226,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Du bør opdatere firmwaren i din dykkercomputer: Du har version %1 hvor den nyeste er version %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Ikke nu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Opdater firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmware opdaterings note</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Gem den downloadede firmware som</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5204,14 +5270,14 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="26"/> <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="26"/> <source>Page 1</source> - <translation type="unfinished"/> + <translation>Side 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="37"/> <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="44"/> <source>Text Field</source> - <translation type="unfinished"/> + <translation>Tekst felt</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> @@ -5330,7 +5396,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5355,6 +5421,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5385,27 +5452,52 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Nulstil alle indstillinger</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Sæt alle indstillinger til default værdier</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Åben standard log fil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> + <translation>Subsurface filer</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> <translation type="unfinished"/> </message> </context> @@ -5562,7 +5654,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5602,7 +5694,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5681,25 +5773,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Valg af nyt sprog vil kræve en genstart af Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5750,7 +5842,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5775,73 +5867,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface web service</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Standard bruger ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Gem bruger ID lokalt?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Netværk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6137,7 +6214,7 @@ Please export this template to a different file.</source> <location filename="../desktop-widgets/printoptions.cpp" line="149"/> <location filename="../desktop-widgets/printoptions.cpp" line="180"/> <source>HTML files</source> - <translation type="unfinished"/> + <translation>HTML filer</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="159"/> @@ -6169,133 +6246,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 af %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Ukendt dykker computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Vis NDL / TTS blev slået fra, da det tog for lang tid at danne den.</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Tilføj gas skift</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Tilføj bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Rediger profilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Slet hændelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Skjul tilsvarende hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Vis alle hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Skjul hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hændelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Fjern de valgte hændelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Rediger bogmærke navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Brugerdefineret navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Navn er for langt!</translation> </message> @@ -6303,53 +6380,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6399,50 +6476,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Ukendt GPS-position</translation> </message> @@ -6450,7 +6527,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6542,116 +6619,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Præferencer</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Ingen sky modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-mail</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blå</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Standard flaske</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Flaske:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6686,13 +6773,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6716,38 +6803,38 @@ Not all images have timestamps in the range between <translation>Hvilke dato/tid er vist på billedet?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Åben billede til</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6840,28 +6927,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> - <translation type="unfinished"/> + <translation>Subsurface filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6869,63 +6956,63 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dykker dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varighed: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dykker lokation: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Makker: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7062,65 +7149,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Indtast bruger ID og klik Download</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Forbinder...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Download færdig</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Download fejl; %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Forbindelse fejl:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Ugyldig bruger id</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Kan ikke fortolke svar!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Download succes</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Dragte:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7130,7 +7169,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> <source>Extra Info</source> - <translation type="unfinished"/> + <translation>Ekstra information</translation> </message> </context> <context> @@ -7208,7 +7247,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/> <source>Water type</source> - <translation type="unfinished"/> + <translation>Vand type</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/> @@ -7251,39 +7290,44 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Slet alle billeder</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Sletter billeder</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Er du sikker på at du vil slette alle billeder?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7451,15 +7495,15 @@ blandes fra Luft ved brug: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Tags:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Tags</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7557,7 +7601,7 @@ blandes fra Luft ved brug: <message> <location filename="../desktop-widgets/templateedit.ui" line="188"/> <source>Custom</source> - <translation type="unfinished"/> + <translation>Tilpasning</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="200"/> @@ -7658,7 +7702,7 @@ blandes fra Luft ved brug: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7682,130 +7726,135 @@ blandes fra Luft ved brug: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> - <translation type="unfinished"/> + <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Makker</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Vægt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Placering</translation> </message> @@ -7819,80 +7868,80 @@ blandes fra Luft ved brug: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Tjek for opdateringer</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kunne ikke tjekke for opdateringer</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Følgende fejl opstod:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Tjek din internet forbindelse.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Du anvender den nyeste version af Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>En ny version af Subsurface er tilgængelig.<br/>Klik på:<br/><a href="%1">%1</a><br/> for at downloade den.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>En ny version af Subsurface er tilgængelig.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Seneste version er %1, tjek venligt %2 vores download side %3 for information om hvordan der opdateres.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Nyeste udgave er</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Serveren returnerede følgende information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Nej Tak</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Kontroller automatisk efter opdateringer</translation> </message> @@ -8065,6 +8114,19 @@ Sprog: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8120,12 +8182,12 @@ Sprog: %1</translation> <translation>Upload</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Tiden er udløbet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Overfører data...</translation> </message> @@ -8151,8 +8213,8 @@ Sprog: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8276,7 +8338,7 @@ Gennemsnit</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8612,9 +8674,9 @@ Gennemsnit</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>ilt</translation> </message> @@ -8629,131 +8691,131 @@ Gennemsnit</translation> <translation>Open circuit</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>f/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>f/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>pund (lbs)</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integreret</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>bælte</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>Clip-On</translation> </message> @@ -8830,123 +8892,123 @@ Gennemsnit</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9045,149 +9107,149 @@ Gennemsnit</translation> <translation>Ugyldigt hændelses nummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Fejl ved fortolkning af dato/tid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Dyk %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Fejl i fortolkning af dykkertid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Fejl i fortolkning af max dybde</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Fejl ved læsning af temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Fejl i fortolkning af antallet af gasser</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Fejl i læsning af saltindhold i vandet</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Fejl ved at opnå overflade tryk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Fejl i fortolkning af gas blanding</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Kan ikke oprette parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Fejl i registrering af data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9210,12 +9272,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Fejl i fortolkning af '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> @@ -9246,8 +9308,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9509,17 +9571,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>lav pO₂ værdi %.2f på %d:%02u med gas %s på dybde %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Kan ikke finde gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9529,21 +9591,21 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min @@ -9551,230 +9613,230 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>In deko (beregn)</translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (beregn)</translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (beregn)</translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Beregnet loft %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Væv %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>bærende: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9823,142 +9885,142 @@ EADD: %d%s / %.1fg/ℓ <translation>V</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>LUFT</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>ILT</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Kan ikke åbne filen %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Lokation</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Luft temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Vand temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Dyk</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Udvid alt</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Skjul alle</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Ture</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistik</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Avanceret søgning </translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Sigtbarhed</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Makker</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Dragt</translation> </message> @@ -9969,180 +10031,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Noter</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Vis flere detaljer</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Årlig statistik</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>År</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Total tid</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Gennemsnits tid</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Korteste tid</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Længste tid</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Gennemsnits dybde</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. dybde</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max dybde</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Gennemsnits SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max SAC.</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Gennemsnits temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Tilbage til listen</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Dyk #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Dykker profil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Dyk information</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Udstyr</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Størrelse</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Arbejdstryk</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Start tryk</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Slut tryk</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Hændelser</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Navn</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Værdi</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Dykkerstatus</translation> </message> @@ -10172,62 +10234,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10473,12 +10535,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. dybde</translation> @@ -10504,77 +10571,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Noter:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Længde</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Høje</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Dybde</translation> </message> @@ -10619,27 +10686,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10654,7 +10721,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Fjern dette punkt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10674,22 +10741,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maksimal</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Ugyldigt svar fra serveren</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Forventet XML tag 'DiveDateReader', fik istedet '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Forventet XML tag 'DiveDates' ikke fundet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Ugyldig XML svar. Linje %1: %2</translation> </message> @@ -10702,112 +10769,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Dykliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Præferencer</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Hjælp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 6a79d1c02..ae7945864 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -166,160 +166,160 @@ <translation>Suche nach externen Geräten...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Suche erfolgreich beendet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Das lokale Bluetooth Gerät war %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>Eingeschaltet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>Ausgeschaltet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>Nicht verbunden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>Verbunden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORISIERT GEPAART</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Das Gerät %1 kann nun für eine Verbindung benutzt werden. Sie können jetzt Speichern.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Das Gerät %1 muss zuerst verbunden werden bevor es genutzt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Geräte benötigen eine Adresse für eine Verbindung.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Das locale Gerät wurde geändert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Verbinden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Verbindung löschen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Versuche Gerät %1 zu verbinden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Versuche Gerät %1 zu trennen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Gerät %1 war nicht verbunden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Gerät %1 war verbunden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Das Gerät %1 kann nun für eine Verbindung benutzt werden. Sie können jetzt Speichern.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Gerätefehler: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Verbindungsfehler. Sollte das externe Gerät einen PIN code benötigen verbinden Sie die Geräte bitte über Ihr Betriebssystem.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Unbekannter Fehler</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetooth ist ausgeschaltet, bitte schalten Sie Bluetooth ein bevor Sie weiterfahren.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Schreibe oder Lesefehler auf oder zu Gerät ergab einen Fehler.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Ein unbekannter Fehler ist aufgetreten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Geräte Suchfehler: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Nicht verfügbar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Auf den Bluetooth Adapter kann nicht zugegriffen werden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Der Geräteerkennungsassistent wurde nicht erstellt, da Adresse %1 nicht der Adapteradresse eines lokalen Bluetooth-Geräts entspricht.</translation> </message> @@ -327,12 +327,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Person: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Sucht nach Buddies und Divemasters</translation> </message> @@ -340,7 +340,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Keine Buddies</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Sicherungs Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML-Sicherungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Sicherung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Deine Einstellungen wurden gespeichert nach: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML-Wiederherstellungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Wiederherstellung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Deine Einstellungen wurden erfolgreich wiederhergestellt.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Firmwaredatei auswählen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Log Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Verbinde mit Gerät...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Gerät verbunden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Gerät getrennt</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation> </message> @@ -1972,22 +1972,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Tauchgangsdetails</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Tauchgang löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Bearbeiten abbrechen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Kartenansicht</translation> </message> @@ -1995,104 +1995,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Tauchgang %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Position:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinaten:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Momentante GPS- Position verwenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Tiefe:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Dauer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Lufttemp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Wassertemp.: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Flasche:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gemisch:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Anfangsdruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Enddruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notizen:</translation> </message> @@ -2261,104 +2293,119 @@ Position verwenden</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Tauchzeiten verschieben</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Ausgewählte Tauchgänge splitten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Bilde(r) von Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Bild aus Web laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Bilddateien (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 scheint kein Bild zu sein</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Bilddateien</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Öffne Bilddateien</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Alle Dateien</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 scheint kein Bild zu sein</translation> </message> </context> <context> @@ -2559,7 +2606,7 @@ Position verwenden</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Licht</translation> </message> @@ -2569,121 +2616,121 @@ Position verwenden</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Kommagetrennte Werte, die das Tauchprofil beschreiben</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Durch Kommata getrennte Werte (CSV) des Taugang. Beinhaltet die meisten Tauchgangsdetauls aber keine Profilinformation.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Tauchgang zu dive-share.appspot.com hochladen.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Natives Subsurface XML-Format</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Schreibe den Tauchgang als TeX-Makros in Datei.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>UDDF-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF Dateien</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX Dateien</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>CSV-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Weltkarte exportieren</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportiere Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Export in TeX-Datei</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>HTML-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Bitte warten Sie, exportiere...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> @@ -3043,62 +3090,62 @@ Position verwenden</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>Fl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC Sollwert</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Tauchmodus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Stopp Zeiten</translation> </message> @@ -3303,261 +3350,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Bilder</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotos vor/während/nach dem Tauchgang</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>keine Tauchgänge ausgewählt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Formatvorlage zum Exportieren auf divelogs.de nicht gefunden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>konnte keine zip-Datei zum Hochladen erstellen: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>ein interner Fehler ist aufgetreten</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Konvertierung von Tauchgang %1 in divelogs.de-Format ist fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Fertig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Liste der Tauchgänge wird hochgeladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Probleme beim Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Das Archiv konnte nicht geöffnet werden: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Hochladen abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Hochladen fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Hochladen erfolgreich</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Anmeldung fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> @@ -3565,23 +3618,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Wählen Sie den Bluetooth download Modus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Verbinde mit Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Fehler</translation> </message> @@ -3591,42 +3644,47 @@ p, li { white-space: pre-wrap; } <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Herunterladen abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Log Dateien</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Wählen Sie die Datei aus, in die der libdivecomputer Dump gespeichert werden soll</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Dump Dateien</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Herunterladen wiederholen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <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> @@ -3698,9 +3756,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3726,7 +3784,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3741,57 +3799,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ist nicht aktiviert</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Hersteller:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Tauchcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation> Verbindung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Neu scannen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3822,12 +3886,12 @@ p, li { white-space: pre-wrap; } <translation>Mit Facebook verbinden Platzhalter</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Die Facebook-Verbindung kann mit dem "Teilen" Menüeintrag beendet werden.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Dadurch ist es möglich, Tauchgänge auf Facebook zu posten.</translation> </message> @@ -3835,22 +3899,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Facebook erfolgreich angemeldet</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Fehler, unbekannte Benutzerkennung, Anmeldung nicht möglich.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Tauchgang erfolgreich auf Facebook hochgeladen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Hochladen der Tauchgänge fehlgeschlagen. Bitte Fehlerausgabe prüfen und an die Subsurface Mailingliste senden!</translation> </message> @@ -3866,17 +3930,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Auswahl invertieren</translation> </message> @@ -3931,17 +3995,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3957,8 +4021,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Bilder Verzeichnisse durchsuchen</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3972,17 +4036,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4075,40 +4139,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Ort:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Position</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (gleiche GPS-Korrektur)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 weg</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n Tauchgang hier)</numerusform><numerusform>, %n Tauchgänge hier)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(keine vorhandenen GPS-Daten, GPS-Korrektur von diesem Tauchgang hinzufügen)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(keine GPS Daten)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Tauchplatz auswählen</translation> </message> @@ -4116,7 +4180,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Kein Ort festgelegt</translation> </message> @@ -4241,8 +4305,8 @@ Möchtest Du fortfahren?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -4263,19 +4327,19 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Ort</translation> </message> @@ -4356,8 +4420,8 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Bilder</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4390,53 +4454,53 @@ Möchtest Du fortfahren?</translation> <translation>Gewicht hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Reiseort</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Neuer Tauchplatz</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Du bist im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -4469,424 +4533,419 @@ Möchtest Du fortfahren?</translation> <translation>&Importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>B&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Teilen auf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Speichern als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Drucken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>GPS-Daten vom Subsurface-Webdienst importieren</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Geräte &Namen bearbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>Tauchgang b&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Tau&chkomponenten kopieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Tauchkom&ponenten einfügen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Automatisch &gruppieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Info zu Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Karte</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Tauchgang planen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Protokolldateien &importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>&Von divelogs.de importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Vollbild</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Vollbild Umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Nach neuer Version suchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Exportiere</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Logbücher exportieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>&Tauchcomputer konfigurieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Tauchgang in Tauchgangs Planer b&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>pO₂-Plot umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>pN₂-Plot umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>pHe-Kurve ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Pulsrate ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>MOD ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC Rate ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Lineal ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Massstabsgraph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Bilder umschalten</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Gasleiste umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Liste der Tauchgänge filtern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Gewebe-Heatmap umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Benutzer&umfrage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>R&ueckgängig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Verschobene Bilder &finden</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Aus C&loud öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>In Clo&ud speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Tauchplätze verwalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Tauchplatz B&earbeitung</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Cloud-Speicher ist online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Sicherungskopie der Druckvorlage erstellt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4907,214 +4966,214 @@ Pfad: Die Druckvorlagen in dieser Subsurface Version sind schreibgeschützt und sollten nicht verändert werden, da neuere Versionen von Subsurface diese überschreiben könnten.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor online gegangen wird</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Es gibt ungesicherte Änderungen. Sollen diese in die Cloud gespeichert werden? Bei "nein" wird die Cloud erst beim nächsten "Cloudspeicher öffnen" oder "In Cloud speichern" synchronisiert.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Fehler beim Verbinden des Cloud-Speichers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor die Datei geschlossen wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine neue zu beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Logbuch Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Du Deine Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[Cloud Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Kontaktiere Cloud Service...</translation> </message> @@ -5171,7 +5230,7 @@ Die QML Module QtPositioning und QtLocation fehlen eventuell!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter zeigt %1 (von %2) Tauchgängen</translation> </message> @@ -5179,12 +5238,12 @@ Die QML Module QtPositioning und QtLocation fehlen eventuell!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Du solltest die Firmware auf Deinem Tauchcomputer aktualisieren: Du hast Version %1, aber die neueste stabile Version ist %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5193,27 +5252,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen wie für ein Logbuch-Download treffen, bevor mit dem Update fortgefahren wird.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Nicht jetzt</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Firmware aktualisieren</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmware-Aktualisierungsbenachrichtigung</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Heruntergeladene Firmware speichern als</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware Dateien</translation> </message> @@ -5351,8 +5410,8 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Keine Standarddatei</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5376,6 +5435,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5406,29 +5466,54 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Alle Einstellungen zurücksetzen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Alle Einstellungen auf Standardwert setzen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Standard-Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5583,8 +5668,8 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Erstelle Miniaturbilder neu wenn es älter ist als das Bild</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5623,7 +5708,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Mittlere Tiefe im Profil anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5702,27 +5787,27 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Diese werden direkt übernommen. Dies könnte nicht das beabsichtigte Verhalten sein, siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Unübersetzte Zeichen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Zeichen ohne Bedeutung im Zeitformat. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Zeichen ohne Bedeutung im Datums-Format. @@ -5774,7 +5859,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface-Cloud-Speicher</translation> </message> @@ -5799,73 +5884,58 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Passwort lokal speichern?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface-Webdienst</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Standard-Benutzerkennung</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Benutzerkennung lokal speichern?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Kein Proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Systemproxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP Proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS Proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Änderung verworfen. Cloud-Speicher E-Mail und Passwort dürfen nur aus Buchstaben, Zahlen und '.', '-', '_', und '+' bestehen.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Änderung verworfen. Cloud-Speicher E-Mail und neues Passwort dürfen nur aus Buchstaben, Zahlen und '.', '-', '_', und '+' bestehen.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface-Cloud-Speicher (Anmeldedaten bestätigt)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface Cloud-Speicher (Passwort falsch)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface Cloud-Speicher (PIN erforderlich)</translation> </message> @@ -6194,133 +6264,133 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Geplanter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Manuell hinzugefügter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Tauchmodus wechseln</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 anpassen (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -6328,53 +6398,53 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Lokale Tauchdatendatei öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Fehler bei Öffnen der lokalen Tauchdatendatei</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 Tauchgänge aus der lokalen Tauchdatendatei geladen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Fehler beim Lesen der lokalen Daten, ich gebe auf</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>keine Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte geben Sie gültige Cloud-Anmeldedaten ein.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Ungültiges Format für E-Mail-Adresse</translation> </message> @@ -6424,50 +6494,50 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud-Anmeldedaten gültig, Tauchgänge werden geladen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Tauchgänge werden aus dem lokalen Speicher geladen (Modus 'keine Cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud-Speicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6475,7 +6545,7 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Starten...</translation> </message> @@ -6567,116 +6637,126 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Undefiniert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Falsche Benutzername/Passwort-Kombination</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Anmeldedaten müssen überprüft werden</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Anmeldedaten überprüft</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Kein Cloud-Modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Cloud-Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-Mail</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Nicht zutreffend</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Ändern</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Motiv</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blau</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>regulärer Text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Hervorheben</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Pink</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Dunkel</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS-Daten-Webdienst</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Entfernungsschwellwert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Zeitschwellwert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Standardflasche</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Flasche:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Entwickler</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Entwicklermenü anzeigen</translation> </message> @@ -6711,15 +6791,14 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Achtung! -Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der ausgewählten Tauchgänge.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Bilder laden, selbst wenn die Zeit nicht der Tauchzeit entspricht</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6742,39 +6821,39 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Öffne Bilddatei</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Bilddateien</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Datum/Zeit des ausgewählten Tauchgangs</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Datum/Zeit des ersten ausgewählten Tauchgangs</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Datum/Zeit des letzten ausgewählten Tauchgangs</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Dateien mit unpassendem Datum/Zeit</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Kein Exif Datum/Zeit gefunden</translation> </message> @@ -6867,28 +6946,28 @@ Dateien mit unpassendem Datum/Zeit</translation> <translation>Nachrichten (Fehlermeldungen, Warnungen usw.) importieren</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>SmartTrak Dateien öffnen</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak Dateien</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Subsurface Dateien öffnen</translation> </message> @@ -6896,64 +6975,64 @@ Dateien mit unpassendem Datum/Zeit</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Klein</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mittel</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Tauchdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Dauer: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Tauchplatz: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Tauchgruppenleiter: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7090,65 +7169,17 @@ Dateien mit unpassendem Datum/Zeit</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Benutzerkennung eingeben und Herunterladen klicken</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webdienst</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Verbinde...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Herunterladen beendet</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Fehler beim Herunterladen: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Verbindungsfehler: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Ungültige Benutzerkennung</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Verstehe die Antwort nicht!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Erfolgreich geladen!</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Anzug:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Kein Anzug eingetragen</translation> </message> @@ -7279,39 +7310,44 @@ Dateien mit unpassendem Datum/Zeit</translation> <translation>Zoomfaktor</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Bild(er) aus Datei(en) laden</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Bild(er) aus Web laden</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Ausgewählte Bilder löschen</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Alle Bilder Löschen</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Ausgewählte Miniaturbilder neu erstellen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Bilder löschen</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Wirklich alle Bilder löschen?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7479,15 +7515,15 @@ den folgenden Gasen gemischt werden: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Stichwörter: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Stichwörter</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Leere Tags</translation> </message> @@ -7686,7 +7722,7 @@ den folgenden Gasen gemischt werden: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1klicken, um zu %2 gehen</translation> </message> @@ -7710,130 +7746,135 @@ den folgenden Gasen gemischt werden: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation> (%1 angezeigt)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>US-Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotos vor/während/nach dem Tauchgang</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Position</translation> </message> @@ -7847,81 +7888,81 @@ den folgenden Gasen gemischt werden: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>URL für Bilder eingeben</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Neue Version suchen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Fehlermeldung erhalten:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Dies ist die neuste Subsurfaceversion.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Es gibt eine neue Subsurface-Version.<br/>Klick hier:<br/><a href="%1">%1</a><br/> zum Download.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Es gibt eine neue Version von Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Die aktuellste Version ist %1, bitte auf unserer %2 Programme herunterladen %3 Seite nachlesen, wo diese Version verfügbar ist.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Die letzte freigegebene Version ist </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface überprüft alle zwei Wochen, ob eine aktuellere Version verfügbar ist. Soll das nicht passieren, bitte "Ablehnen" klicken.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Ablehnen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automatisch nach Aktualisierungen suchen</translation> </message> @@ -8097,6 +8138,19 @@ Sprache: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8152,12 +8206,12 @@ Sprache: %1</translation> <translation>Hochladen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Die Aktion hat zu lange gedauert</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Daten werden übertragen...</translation> </message> @@ -8183,8 +8237,8 @@ Sprache: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Kein Fehler</translation> </message> @@ -8308,7 +8362,7 @@ Durchschnitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Fehler beim Lesen der Kopfdaten</translation> </message> @@ -8645,9 +8699,9 @@ Durchschnitt</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>Sauerstoff</translation> </message> @@ -8662,131 +8716,131 @@ Durchschnitt</translation> <translation>Offenes System</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integriert</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>Gürtel</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>Fussblei</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>Backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8863,123 +8917,123 @@ Durchschnitt</translation> <translation>Kein Profil in '%s' gefunden.</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Laden aus dem Cloud-Speicher (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Übertragung aus dem Cloud-Speicher (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Übertragung in den Cloud-Speicher (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Der lokale Zwischenspeicher %s ist korrupt, Daten können nicht mit dem Cloud Speicher synchronisiert werden</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface Cloud Speicher ist unbrauchbar</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Der Subsurface Cloud Speicher konnte nicht aktualisiert werden, versuche es später nocheinmal</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Lokale Version und Serverversion sind verschieden</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Es gibt Probleme mit dem lokalen Subsurface Cloud Zwischenspeicher</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Zwischenspeicher Daten nach %s verschoben. Bitte versuchen Sie es noch einmal.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Gleiche lokalen an den Cloud-Speicher an</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Übertrage lokale Veränderungen in die Cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Veruche lokale Änderungen in die Cloud einzufügen.</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Speichere Daten in die Cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Mit Cloud-Speicher synchronisieren</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Cloud-Server nicht erreichbar, arbeite mit lokalen Daten</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Erfolgreiche Cloud-Verbindung, hole Daten</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Synchronisierung mit Cloud erfolgreich</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Fehler beim Verbinden mit dem Subsurface Cloud Speicher</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>GIT Clone von %s ist gescheitert (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Datendatei wird synchronisiert</translation> </message> @@ -9078,119 +9132,119 @@ Durchschnitt</translation> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Fehler beim Lesen der Temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Tauchgang bereits heruntergeladen am %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Fehler beim Öffnen von Gerät %s %s (%s). In solchen Fällen helfen in der Regel die Logdateien den Entwicklern bei der Fehlersuche. Diese können auf der 'Über' Seite kopiert werden.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9199,13 +9253,13 @@ In solchen Fällen ist oft eine libdivecomputer Logdatei hilfreich. Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>mehrere GPS-Positionen für diesen Tauchplatz; ebenso %s @@ -9213,19 +9267,19 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>Zusätzlicher Name für Tauchplatz: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Lade Tauchgänge aus dem lokalen Zwischenspeicher</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Tauchdaten erfolgreich geöffnet</translation> </message> @@ -9248,12 +9302,12 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -9284,8 +9338,8 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>, effektive GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Setpoint-Änderung</translation> </message> @@ -9547,17 +9601,17 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9566,84 +9620,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9652,7 +9706,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9661,175 +9715,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Dichte: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>Nullzeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>Gesamtaufstiegszeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>Restgrundzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Gewebe %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD im Führungsgewebe </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>Puslrate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Durchschnittstiefe bis hier %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9878,142 +9932,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mehr als %1 Tage</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>SAUERSTOFF</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Tauchgänge</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Ausflüge</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistiken</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Erweiterte Suche</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Sicht</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Anzug</translation> </message> @@ -10024,180 +10078,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mehr Details anzeigen</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Jahr</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Gesamtzeit</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Durchschnittszeit</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Kürzeste Zeit</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Längste Zeit</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Durchschnittstiefe</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. Tiefe</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max. Tiefe</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Durchschnittliches SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Durchschnittstemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. Temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. Temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Zurück zur Liste</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Tauchgang Nr.</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Tauchprofil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Tauchinformation</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Tauchausrüstung</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Grösse</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Arbeitsdruck</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Anfangsdruck</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Enddruck</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Ereignisse</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Wert</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinaten</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Tauchstatus</translation> </message> @@ -10227,62 +10281,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Alle (nach Reisen)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10533,12 +10587,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>s</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. Tiefe:</translation> @@ -10564,77 +10623,77 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Notizen:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Gesunken</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Sinkzeit</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Grund</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationalität</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Werft</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Schiffstyp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Länge</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Schiffsbreite</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Tiefgang</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Verdrängung</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Ladung</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Wrackdaten</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Tiefe</translation> </message> @@ -10679,27 +10738,27 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Grossstadt</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Beginne Datenspeicherung</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Beginne Tauchgänge zu speichern</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Lokaler Zwischenspeicher erzeugt</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Bereite Datenspeicherung vor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>Tauchmoduswechsel</translation> </message> @@ -10714,7 +10773,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Diesen Punkt entfernen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Kein leeres Logbuch in der Cloud speichern</translation> </message> @@ -10734,22 +10793,22 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Max.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Ungültige Serverantwort</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML Tag 'DiveDates' nicht gefunden.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Ungültige XML Antwort. Zeile %1: %2</translation> </message> @@ -10762,112 +10821,102 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Tauchgangsliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Tauchgangsverwaltung</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Automatische Synchronisation deaktivieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Automatische Synchronisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Ortungsdienst deaktivieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Von Tauchcomputer herunterladen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Manuelle Cloud-Synchronisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Abschalten der Cloud-Synchronisierung führt dazu, dass sämtliche Daten nur lokal gespeichert werden. Dies ist sinnvoll bei beschränkter Internetverfügbarkeit. Durch Auswählen von "Manuelle Cloud-Synchronisation" kann eine Synchronisation explizit gestartet werden, wenn eine ausreichende Internetverbindung besteht.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>GPS-Daten hochladen</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>GPS Positionen anwenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>GPS-Daten herunterladen</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>GPS-Positionen anzeigen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>GPS-Speicher löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Entwickler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App-Protokoll</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Theme-Information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Über</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Ortungsdienst ausführen</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index f8782c1c5..63ff98739 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -166,160 +166,160 @@ <translation>Nach externen Geräten wird gesucht...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Suchvorgang erfolgreich beendet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Das lokale Bluetooth-Gerät war %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>eingeschaltet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>ausgeschaltet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNGEPAART</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>GEPAART</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORISIERT GEPAART</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Das Gerät %1 kann für die Verbindung verwendet werden. Sie können die Schaltfläche Speichern drücken.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Das Gerät %1 muss verbunden sein, um verwendet werden zu können. Bitte verwenden Sie das Kontextmenü für Verbindungsoptionen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Geräte benötigen eine Adresse für eine Verbindung.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Das lokale Gerät wurde geändert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Verbindung</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Paarung aufheben</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Es wird versucht, dass Gerät %1 zu verbinden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Es wird versucht, dass Gerät %1 zu trennen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Gerät %1 wurde getrennt.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Gerät %1 wurde verbunden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Das Gerät %1 kann jetzt für die Verbindung verwendet werden. Sie können die Schaltfläche Speichern drücken.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Lokaler Gerätefehler: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Paarungsfehler. Wenn das Gerät eine PIN verlangt, bitte versuchen, es über das Betriebssystem zu paaren.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Unbekannter Fehler</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Der Bluetooth-Adapter ist ausgeschaltet. Schalten Sie ihn ein, bevor Sie die Erkennung durchführen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Schreiben oder Lesen vom Gerät fehlerhaft.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Ein unbekannter Fehler ist aufgetreten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Geräterkennungsfehler: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Nicht verfügbar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Auf den lokalen Bluetooth-Adapter kann nicht zugegriffen werden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Der Geräteerkennungsassistent wurde nicht erstellt, da Adresse %1 nicht der Adapteradresse eines lokalen Bluetooth-Geräts entspricht.</translation> </message> @@ -327,12 +327,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Person: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Sucht nach Tauchgruppenleiter und Tauchpartner</translation> </message> @@ -340,7 +340,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Keine Tauchpartner</translation> </message> @@ -1661,102 +1661,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Sicherungs Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML-Sicherungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Sicherung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML-Wiederherstellungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Wiederherstellung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Firmwaredatei auswählen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Log Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Verbinde mit Gerät...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Gerät verbunden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Gerät getrennt</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation> </message> @@ -1971,22 +1971,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Tauchgangsdetails</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Tauchgang löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Bearbeiten abbrechen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Kartenansicht</translation> </message> @@ -1994,104 +1994,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Tauchgang %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Position:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinaten:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Momentante GPS- Position verwenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Tiefe:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Dauer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Lufttemp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Wassertemp.: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Tauchpartner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Flasche:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Flasche1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gemisch:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Anfangsdruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Enddruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Flasche2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Flasche3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Flasche4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Flasche5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notizen:</translation> </message> @@ -2260,104 +2292,119 @@ Position verwenden</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Tauchgäng(e) aus Reise entfernen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Tauchzeiten verschieben</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Ausgewählte Tauchgänge aufteilen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Bild(er) aus Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Bild aus Web laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Bilddateien (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Mediendatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 scheint kein Bild zu sein</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Mediendateien</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Bilddateien</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Öffne Bilddateien</translation> + <source>Video files</source> + <translation>Videodateien</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Alle Dateien</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 scheint kein Bild zu sein</translation> </message> </context> <context> @@ -2558,7 +2605,7 @@ Position verwenden</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Licht</translation> </message> @@ -2568,121 +2615,121 @@ Position verwenden</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Kommagetrennte Werte, die das Tauchprofil beschreiben</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Durch Kommata getrennte Werte (CSV) des Taugang. Beinhaltet die meisten Tauchgangsdetauls aber keine Profilinformation.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Tauchgang zu dive-share.appspot.com hochladen.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Natives Subsurface-XML-Format</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Schreibe den Tauchgang als TeX-Makros in Datei.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>UDDF-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF Dateien</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX Dateien</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>CSV-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Weltkarte exportieren</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportiere Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Export in TeX-Datei</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>HTML-Datei exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Bitte warten, Exportiervorgang...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> @@ -3042,62 +3089,62 @@ Position verwenden</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>Fl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Verw. Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Tauchmodus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Stopp Zeiten</translation> </message> @@ -3302,261 +3349,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Bilder</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Medien</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Tauchpartner</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Position</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotos vor/während/nach dem Tauchgang</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Medien vor/während/nach Tauchgang</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>keine Tauchgänge ausgewählt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Formatvorlage zum Exportieren auf divelogs.de nicht gefunden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>konnte keine zip-Datei zum Hochladen erstellen: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>ein interner Fehler ist aufgetreten</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Konvertierung von Tauchgang %1 in divelogs.de-Format ist fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Fertig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Liste der Tauchgänge wird hochgeladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problem beim Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Das Archiv konnte nicht geöffnet werden: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Hochladen abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Hochladen fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Hochladen erfolgreich</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Anmeldung fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> @@ -3564,23 +3617,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Bluetooth-Modus auswählen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Verbinde mit Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Fehler</translation> </message> @@ -3590,42 +3643,47 @@ p, li { white-space: pre-wrap; } <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Garmin-Tauchcomputer finden</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Herunterladen abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Log Dateien</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Wählen Sie die Datei aus, in die der libdivecomputer Dump gespeichert werden soll</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Dump Dateien</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Herunterladen wiederholen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <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> @@ -3697,9 +3755,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3725,7 +3783,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3740,57 +3798,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ist nicht aktiviert</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Hersteller:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>USB Gerät</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Tauchcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation> Verbindung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Neu scannen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3821,12 +3885,12 @@ p, li { white-space: pre-wrap; } <translation>Mit Facebook verbinden Platzhalter</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Die Facebook-Verbindung kann mit dem "Teilen" Menüeintrag beendet werden.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Dadurch ist es möglich, Tauchgänge auf Facebook zu posten.</translation> </message> @@ -3834,22 +3898,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Facebook erfolgreich angemeldet</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Fehler, unbekannte Benutzerkennung, Anmeldung nicht möglich.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Tauchgang erfolgreich auf Facebook hochgeladen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Hochladen der Tauchgänge fehlgeschlagen. Bitte Fehlerausgabe prüfen und an die Subsurface Mailingliste senden!</translation> </message> @@ -3865,17 +3929,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Auswahl invertieren</translation> </message> @@ -3930,18 +3994,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Verschobene Bilder finden</translation> + <source>Find moved media files</source> + <translation>Verschobene Mediendateien suchen</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Bilder gefunden</translation> + <source>Found media files</source> + <translation>Gefundene Mediendateien</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Nur Bilder von ausgewählten Tauchgäng(en) berücksichtigen</translation> + <source>Match only media files in selected dive(s)</source> + <translation>Nur Mediendateien mit ausgewählten Tauchgängen zusammenführen</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3956,8 +4020,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Bildverzeichnisse durchsuchen</translation> + <source>Traverse media directories</source> + <translation>Medien-Verzeichnisse durchsuchen</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3971,18 +4035,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>Keine passenden Bilder gefunden</translation> + <source>No matching media files found</source> + <translation>Keine passenden Mediendateien gefunden</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation><b>%1</b> Bilder am ursprünglichen Ort gefunden.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation><b>%1</b> Mediendateien am alten Platz gefunden.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation><b>%1</b> Bilder an neuem Ort gefunden:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation><b>%1</b> Mediendateien an neuem Ort gefunden:</translation> </message> </context> <context> @@ -4074,40 +4138,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Position:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Position</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (gleiche GPS-Korrektur)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 weg</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n Tauchgang hier)</numerusform><numerusform>, %n Tauchgänge hier)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(keine vorhandenen GPS-Daten, GPS-Korrektur von diesem Tauchgang hinzufügen)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(keine GPS-Daten)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Tauchplatz auswählen:</translation> </message> @@ -4115,7 +4179,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Keine Position festgelegt</translation> </message> @@ -4240,8 +4304,8 @@ Trotzdem fortfahren?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -4262,19 +4326,19 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Position</translation> </message> @@ -4355,8 +4419,8 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Bilder</translation> + <source>Media</source> + <translation>Medien</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4389,53 +4453,53 @@ Trotzdem fortfahren?</translation> <translation>Gewicht hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Reiseort</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Neuer Tauchplatz</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -4468,424 +4532,419 @@ Trotzdem fortfahren?</translation> <translation>&Importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>B&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Teilen auf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Neues Logbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Logbuch &öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Speichern als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Schließen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Schliessen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Drucken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>GPS-Daten von Subsurface-Webdienst importieren</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Geräte&namen bearbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>Tauchgang b&earbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Tau&chkomponenten kopieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Tauchkom&ponenten einfügen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Automatisch &gruppieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Tauchgangsliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Vo&rheriger TC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Nächster TC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Info zu Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Karte</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Tauchgang p&lanen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Logbuchdatei &importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Logbuchdateien von anderen Anwendungen importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>&Von divelogs.de importieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Vollbild</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Vollbild umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Nach neuer Version suchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exportiere</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Logbücher exportieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>&Tauchcomputer konfigurieren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>&Tauchgang im Planer bearbeiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>pO₂-Plot umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>pN₂-Plot umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>pHe-Kurve umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Vom Tauchcomputer berechnete Auftauchgrenze umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Berechnete Auftauchgrenze umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Berechnung aller Gewebe umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berechnete Auftauchgrenze in 3 m Schritten umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Pulsrate umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>MOD umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Nullzeit, Gesamtaufstiegszeit umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>AMV-Rate umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Lineal umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Maßstabsgraph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Bilder umschalten</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Medien umschalten</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>Suche verschobene Mediendateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Gasleiste umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Liste der Tauchgänge &filtern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Gewebe-Heatmap umschalten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Benutzer&umfrage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Rückgängig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Wiederherstellen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Finde verschobene Bilder</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>C&loud-Speicher öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>In Clo&ud-Speicher speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Tauchplätze ver&walten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Tauchplatzb&earbeitung</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Cloud-Speicher ist online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Sicherungskopie der Druckvorlage erstellt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4906,214 +4965,214 @@ Pfad: Die Druckvorlagen in dieser Subsurface Version sind schreibgeschützt und sollten nicht verändert werden, da neuere Versionen von Subsurface diese überschreiben könnten.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor online gegangen wird</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Es gibt ungesicherte Änderungen. Sollen diese in die Cloud gespeichert werden? Bei "nein" wird die Cloud erst beim nächsten "Cloudspeicher öffnen" oder "In Cloud speichern" synchronisiert.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Fehler beim Verbinden des Cloud-Speichers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor die Datei geschlossen wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Runtimetabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Logbuch Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Sie Ihre Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[Cloud-Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation> </message> @@ -5170,7 +5229,7 @@ Die QML Module QtPositioning und QtLocation fehlen eventuell!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter zeigt %1 (von %2) Tauchgängen</translation> </message> @@ -5178,12 +5237,12 @@ Die QML Module QtPositioning und QtLocation fehlen eventuell!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Sie sollten die Firmware auf Ihrem Tauchcomputer aktualisieren: Sie haben Version %1, aber die neueste stabile Version ist %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5192,27 +5251,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen wie für ein Logbuch-Download treffen, bevor mit dem Update fortgefahren wird.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Nicht jetzt</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Firmware aktualisieren</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmware-Aktualisierungsbenachrichtigung</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Heruntergeladene Firmware speichern als</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware Dateien</translation> </message> @@ -5350,8 +5409,8 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Keine Standarddatei</translation> + <source>&No default file</source> + <translation>Kei&ne Default-Datei</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5375,6 +5434,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5405,29 +5465,54 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Video-Standbilder</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>ffmpeg Programm</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>An Position extrahieren</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Standbilder extrahieren</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Alle Einstellungen zurücksetzen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Alle Einstellungen auf Standardwert setzen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Standard-Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>ffmpeg-Programm auswählen</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5582,8 +5667,8 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Erstelle Miniaturbilder neu wenn es älter ist als das Bild</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Standbilder neu berechnen, wenn älter als Video</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5622,7 +5707,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Mittlere Tiefe im Profil anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5701,27 +5786,27 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Diese werden direkt übernommen. Dies könnte nicht das beabsichtigte Verhalten sein, siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Unübersetzte Zeichen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Zeichen ohne Bedeutung im Zeitformat. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Zeichen ohne Bedeutung im Datums-Format. @@ -5773,7 +5858,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface-Cloud-Speicher</translation> </message> @@ -5798,73 +5883,58 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Passwort lokal speichern?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface-Webdienst</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Standard-Benutzerkennung</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Benutzerkennung lokal speichern?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Kein Proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Systemproxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP Proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS Proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Änderung verworfen. Cloud-Speicher E-Mail und Passwort dürfen nur aus Buchstaben, Zahlen und '.', '-', '_', und '+' bestehen.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Änderung verworfen. Cloud-Speicher E-Mail und neues Passwort dürfen nur aus Buchstaben, Zahlen und '.', '-', '_', und '+' bestehen.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface-Cloud-Speicher (Anmeldedaten bestätigt)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface Cloud-Speicher (Passwort falsch)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface Cloud-Speicher (PIN erforderlich)</translation> </message> @@ -6193,133 +6263,133 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Geplanter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Manuell hinzugefügter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Tauchgang aufteilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Tauchmodus wechseln</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 anpassen (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -6327,53 +6397,53 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Lokale Tauchdatendatei öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Fehler bei Öffnen der lokalen Tauchdatendatei</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 Tauchgänge aus der lokalen Tauchdatendatei geladen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Fehler beim Lesen der lokalen Daten, ich gebe auf</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>keine Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte geben Sie gültige Cloud-Anmeldedaten ein.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Ungültiges Format für E-Mail-Adresse</translation> </message> @@ -6423,50 +6493,50 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud-Anmeldedaten gültig, Tauchgänge werden geladen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Tauchgänge werden aus dem lokalen Speicher geladen (Modus 'keine Cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud-Speicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6474,7 +6544,7 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Starten...</translation> </message> @@ -6566,116 +6636,126 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Undefiniert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Falsche Benutzername/Passwort-Kombination</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Anmeldedaten müssen überprüft werden</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Anmeldedaten überprüft</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Kein Cloud-Modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Cloud-Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-Mail</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Nicht zutreffend</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Ändern</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Motiv</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blau</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>regulärer Text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Hervorheben</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Pink</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Dunkel</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS-Daten-Webdienst</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Entfernungsschwellwert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Zeitschwellwert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Standardflasche</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Flasche:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Entwickler</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Entwicklermenü anzeigen</translation> </message> @@ -6710,15 +6790,15 @@ Bitte mit einem neuen Dateinamen exportieren.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Achtung! -Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der ausgewählten Tauchgänge.</translation> +Nicht alle Mediendateien haben Zeitstempel zwischen 30 Minuten vor und 30 Minuten nach einem der ausgewählten Tauchgänge.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Bilder laden, selbst wenn die Zeit nicht der Tauchzeit entspricht</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Mediendateien laden auch wenn sie nicht mit der Zeit des Tauchgangs zusammenpassen</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6741,39 +6821,39 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Öffne Bilddatei</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Bilddateien</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Datum/Zeit des ausgewählten Tauchgangs</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Datum/Zeit des ersten ausgewählten Tauchgangs</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Datum/Zeit des letzten ausgewählten Tauchgangs</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Dateien mit unpassendem Datum/Zeit</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Kein Exif Datum/Zeit gefunden</translation> </message> @@ -6866,28 +6946,28 @@ Dateien mit unpassendem Datum/Zeit</translation> <translation>Nachrichten (Fehlermeldungen, Warnungen usw.) importieren</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>SmartTrak Dateien öffnen</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak Dateien</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Subsurface Dateien öffnen</translation> </message> @@ -6895,64 +6975,64 @@ Dateien mit unpassendem Datum/Zeit</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Klein</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mittel</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Tauchdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Dauer: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Tauchplatz: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Tauchgruppenleiter: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7089,65 +7169,17 @@ Dateien mit unpassendem Datum/Zeit</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Benutzerkennung eingeben und Herunterladen klicken</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webdienst</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Verbinde...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Herunterladen beendet</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Fehler beim Herunterladen: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Verbindungsfehler: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Ungültige Benutzerkennung</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Verstehe die Antwort nicht!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Erfolgreich heruntergeladen</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Anzug:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Kein Anzug eingetragen</translation> </message> @@ -7278,39 +7310,44 @@ Dateien mit unpassendem Datum/Zeit</translation> <translation>Zoomfaktor</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Bild(er) aus Datei(en) laden</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Bild(er) aus Web laden</translation> + <source>Load media from file(s)</source> + <translation>Medien aus Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Ausgewählte Bilder löschen</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Mediendatei(en) aus dem Netz laden</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Alle Bilder Löschen</translation> + <source>Delete selected media files</source> + <translation>Ausgewählte Mediendateien löschen</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Alle Mediendateien löschen</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Ordner der ausgewählten Mediendateien öffnen</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Ausgewählte Miniaturbilder neu erstellen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Bilder löschen</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>Mediendateien werden gelöscht</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Wirklich alle Bilder löschen?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Wirklich alle Mediendateien löschen?</translation> </message> </context> <context> @@ -7478,15 +7515,15 @@ den folgenden Gasen gemischt werden: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Stichwörter: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Stichwörter</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Leere Tags</translation> </message> @@ -7685,7 +7722,7 @@ den folgenden Gasen gemischt werden: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1klicken, um zu %2 gehen</translation> </message> @@ -7709,130 +7746,135 @@ den folgenden Gasen gemischt werden: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 angezeigt)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Medien vor/während/nach Tauchgang</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Tauchpartner</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>US-Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotos vor/während/nach dem Tauchgang</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Position</translation> </message> @@ -7846,81 +7888,81 @@ den folgenden Gasen gemischt werden: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>URL für Bilder eingeben</translation> + <source>Enter URL for media files</source> + <translation>URL der Mediendateien</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Neue Version suchen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Fehlermeldung erhalten:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Dies ist die neuste Subsurfaceversion.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Es gibt eine neue Subsurface-Version.<br/>Klick hier:<br/><a href="%1">%1</a><br/> zum Download.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Es gibt eine neue Version von Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Die aktuellste Version ist %1, bitte auf unserer %2 Programme herunterladen %3 Seite nachlesen, wo diese Version verfügbar ist.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Die letzte freigegebene Version ist </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface überprüft alle zwei Wochen, ob eine aktuellere Version verfügbar ist. Soll das nicht passieren, bitte "Ablehnen" klicken.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Ablehnen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automatisch nach Aktualisierungen suchen</translation> </message> @@ -8096,6 +8138,19 @@ Sprache: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>ffmpeg konnte nicht gestartet werden - Standbildberechnung ausgesetzt</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>Zu lange auf ffmpeg gewartet - Standbildberechnung ausgesetzt</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8151,12 +8206,12 @@ Sprache: %1</translation> <translation>Hochladen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Die Aktion hat zu lange gedauert</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Daten werden übertragen...</translation> </message> @@ -8182,8 +8237,8 @@ Sprache: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Kein Fehler</translation> </message> @@ -8307,7 +8362,7 @@ Durchschnitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Fehler beim Lesen der Kopfdaten</translation> </message> @@ -8644,9 +8699,9 @@ Durchschnitt</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>Sauerstoff</translation> </message> @@ -8661,131 +8716,131 @@ Durchschnitt</translation> <translation>Offenes System</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integriert</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>Gürtel</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>Fussblei</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>Backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8862,123 +8917,123 @@ Durchschnitt</translation> <translation>Kein Profil in '%s' gefunden.</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Laden aus dem Cloud-Speicher (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Übertragung aus dem Cloud-Speicher (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Übertragung in den Cloud-Speicher (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Lokales Cacheverzeichnis %s beschädigt - kann nicht mit dem Subsurface-Cloud-Speicher synchronisieren</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface-Cloud-Speicher beschädigt</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Subsurface-Cloud-Speicher konnte nicht aktualisiert werden, versuchen Sie es später noch einmal</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Lokale Version und Serverversion sind verschieden</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Probleme mit dem lokalen Cache der Subsurface-Cloud-Daten</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Cachedaten auf %s verschoben. Bitte versuchen Sie es erneut.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Gleiche lokalen an den Cloud-Speicher an</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Übertrage lokale Veränderungen in die Cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Veruche lokale Änderungen in die Cloud einzufügen.</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Speichere Daten in die Cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Mit Cloud-Speicher synchronisieren</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Cloud-Server nicht erreichbar, arbeite mit lokalen Daten</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Erfolgreiche Cloud-Verbindung, hole Daten</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Synchronisierung mit Cloud erfolgreich</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Fehler beim Verbinden mit dem Subsurface-Cloud-Speicher</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone von %s fehlgeschlagen (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Datendatei wird synchronisiert</translation> </message> @@ -9077,119 +9132,119 @@ Durchschnitt</translation> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Fehler beim Lesen der Temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Segmente</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Tauchgang bereits heruntergeladen am %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Fehler beim Öffnen von Gerät %s %s (%s). In solchen Fällen helfen in der Regel die Logdateien den Entwicklern bei der Fehlersuche. Diese können auf der 'Über' Seite kopiert werden.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9198,13 +9253,13 @@ In solchen Fällen ist oft eine libdivecomputer Logdatei hilfreich. Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>mehrere GPS-Positionen für diesen Tauchplatz; ebenso %s @@ -9212,19 +9267,19 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>zusätzlicher Name für Platz: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Lade Tauchgänge aus dem lokalen Zwischenspeicher</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Tauchdaten erfolgreich geöffnet</translation> </message> @@ -9247,12 +9302,12 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -9283,8 +9338,8 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>, effektive GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Setpoint-Änderung</translation> </message> @@ -9546,17 +9601,17 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9565,84 +9620,84 @@ Tiefe: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>AMV: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9651,7 +9706,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9660,175 +9715,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Dichte: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>Nullzeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>Gesamtaufstiegszeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>Restgrundzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechnete Auftauchgrenze %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Gewebe %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD im Führungsgewebe </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>Puslrate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Durchschnittstiefe bis hier %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s AMV:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9877,142 +9932,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mehr als %1 Tage</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n Tauchgang(e))</numerusform><numerusform>(%n Tauchgäng(e))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>SAUERSTOFF</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Kann Datei %s nicht öffnen</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Position</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Tauchgänge</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Reisen</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistiken</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Erweiterte Suche</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Sicht</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Tauchgruppenleiter</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Tauchpartner</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Anzug</translation> </message> @@ -10023,180 +10078,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notizen</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mehr Details anzeigen</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Jahr</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Gesamtzeit</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Durchschnittszeit</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Kürzeste Zeit</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Längste Zeit</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Durchschnittstiefe</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. Tiefe</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max. Tiefe</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Durchschnittliches AMV</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. AMV</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max. AMV</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Durchschnittstemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. Temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. Temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Zurück zur Liste</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Tauchgang Nr.</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Tauchprofil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Tauchinformation</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Tauchausrüstung</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Arbeitsdruck</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Anfangsdruck</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Enddruck</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Ereignisse</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Wert</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinaten</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Tauchstatus</translation> </message> @@ -10226,62 +10281,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Alle (nach Reisen)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10532,12 +10587,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>s</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>Kann keinen Ordner names 'theme' finden</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. Tiefe:</translation> @@ -10563,77 +10623,77 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Notizen:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Gesunken</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Sinkzeit</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Grund</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationalität</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Werft</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Schiffstyp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Länge</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Schiffsbreite</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Tiefgang</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Verdrängung</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Ladung</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Wrackdaten</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Tiefe</translation> </message> @@ -10678,27 +10738,27 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Großstadt</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Beginne Datenspeicherung</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Beginne Tauchgänge zu speichern</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Lokaler Zwischenspeicher erzeugt</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Bereite Datenspeicherung vor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>Tauchmoduswechsel</translation> </message> @@ -10713,7 +10773,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Diesen Punkt entfernen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Kein leeres Logbuch in der Cloud speichern</translation> </message> @@ -10733,22 +10793,22 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Max.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Ungültige Serverantwort</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML Tag 'DiveDates' nicht gefunden.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Ungültige XML Antwort. Zeile %1: %2</translation> </message> @@ -10761,112 +10821,102 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Tauchgangsliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Tauchgangsverwaltung</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Automatische Synchronisation deaktivieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Automatische Synchronisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Ortungsdienst deaktivieren</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Von Tauchcomputer herunterladen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Manuelle Cloud-Synchronisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Abschalten der Cloud-Synchronisierung führt dazu, dass sämtliche Daten nur lokal gespeichert werden. Dies ist sinnvoll bei beschränkter Internetverfügbarkeit. Durch Auswählen von "Manuelle Cloud-Synchronisation" kann eine Synchronisation explizit gestartet werden, wenn eine ausreichende Internetverbindung besteht.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>GPS-Daten hochladen</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>GPS Positionen anwenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>GPS-Daten herunterladen</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>GPS-Positionen anzeigen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>GPS-Speicher löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Entwickler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App-Protokoll</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Theme-Information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Über</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Ortungsdienst ausführen</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index a2998e375..767ea0bb4 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -163,160 +163,160 @@ <translation>Σάρωση για απομακρυσμένες συσκευές... </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Η σάρωση περατώθηκε επιτυχώς. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Η τοπική συσκευή Bluetooth ήταν %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>ανοικτό</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>κλειστό</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>ΜΗ ΣΥΖΕΥΓΜΕΝΟ</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>ΣΥΖΕΥΓΜΕΝΟ</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>ΕΞΟΥΣΙΟΔΟΤΗΜΕΝΟ_ΣΥΖΕΥΓΜΕΝΟ</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Κατάσταση: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Η συσκευή %1 μπορεί να χρησιμοποιηθεί για σύνδεση. Μπορείτε να πιέσετε το κουμπί Αποθήκευση.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Η συσκευή %1 πρέπει να συζευχθεί ώστε να χρησιμοποιηθεί. Παρακαλώ χρησιμοποιείστε τον αρχικό κατάλογο για επιλογές σύζευξης.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Η τοπική συσκευή τροποποιήθηκε. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Σύζευξη</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Απομάκρυνση σύζευξης</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Προσπάθεια σύζευξης συσκευής %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Προσπάθεια αποσύζευξης συσκευής %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Η συσκευή %1 αποσυζεύχθηκε</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Η συσκευή %1 συζεύχθηκε</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Η συσκευή %1 συζεύχθηκε και έχει εξουσιοδοτηθεί</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Η συσκευή %1 μπορεί πλέον να χρησιμοποιηθεί για σύνδεση. Μπορείτε να πιέσετε το κουμπί Αποθήκευση.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Σφάλμα τοπικής συσκευής: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Σφάλμα σύζευξης. Αν η απομακρυσμένη συσκευή απαιτεί έναν συγκεκριμένο κωδικό PIN, προσπαθήστε να συζεύξετε την συσκευή χρησιμοποιώντας το λειτουργικό σας σύστημα. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Άγνωστο σφάλμα</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Ο προσαρμογέας Bluetooth είναι κλειστός, ανοίξτε τον πριν προβείτε σε εύρεση.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Η εγγραφή ή η ανάγνωση από την συσκευή οδήγησε σε σφάλμα. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Προέκυψε ένα άγνωστο σφάλμα.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Σφάλμα εύρεσης συσκευής: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Μη διαθέσιμο</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Ο τοπικός προσαρμογέας Bluetooth δεν είναι προσβάσιμος.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Ο παράγοντας εύρεσης της συσκευής δεν δημιουργήθηκε διότι η διεύθυνση %1 δεν συμπίπτει με την φυσική διεύθυνση προσαρμογέα οποιασδήποτε τοπικής συσκευής Bluetooth. </translation> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Άτομο:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Αναζήτηση για καταδυτικό ζευγάρι και divemasters</translation> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Χωρίς καταδυτικό ζευγάρι</translation> </message> @@ -1658,100 +1658,100 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Δημιουργία αντιγράφου ασφαλείας ρυθμίσεων καταδυτικού υπολογιστή </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Σφάλμα αντιγραφής ασφαλείας XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Εμφανίστηκε σφάλμα κατά την αποθήκευση του αρχείου αντιγράφου ασφαλείας %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Η δημιουργία αντιγράφου ασφαλείας πέτυχε </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Οι ρυθμίσεις αποθηκεύτηκαν στο : %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Επαναφορά ρυθμίσεων καταδυτικού υπολογιστή </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Σφάλμα επαναφοράς XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Εμφανίστηκε σφάλμα κατά την επαναφορά του αρχείου αντιγράφου ασφαλείας %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Η επαναφορά πέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Οι ρυθμίσεις επαναφέρθηκαν με επιτυχία</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Επιλογή αρχείου υλικολογισμικού</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1966,22 +1966,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Λεπτομέρειες κατάδυσης </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Διαγραφή κατάδυσης</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Προβολή στον χάρτη</translation> </message> @@ -1989,103 +1989,135 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Κατάδυση %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Ημερομηνία:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Τοποθεσία:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Συντεταγμένες:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Χρήση τρέχουσας θέσης GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Βάθος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Διάρκεια:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Θερμοκρασία Ατμόσφαιρας:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Θερμοκρασία Νερού:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Στολή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Καταδυτικό ζευγάρι:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Βάρος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Φιάλη:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Μείγμα αερίου:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Πίεση στην αρχή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Πίεση στο τέλος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Βαθμός:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Σημειώσεις:</translation> </message> @@ -2254,104 +2286,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Επέκταση όλων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Σύμπτυξη όλων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Σύμπτυξη των άλλων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Αφαίρεση κατάδυσης(-σεων) από το ταξίδι</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Δημιουργία νέου ταξιδιού από πάνω</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Προσθήκη κατάδυσης(σεων) στο αμέσως πιο πάνω ταξίδι</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Προσθήκη κατάδυσης(σεων) στο αμέσως πιο κάτω ταξίδι </translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Συγχώνευση με το από πάνω ταξίδι</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Συγχώνευση με το από κάτω ταξίδι.</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Διαγραφή κατάδυσης(-σεων)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Επισημάνετε την(ις) κατάδυση(σεις) ως άκυρη(ες)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Συγχώνευση επιλεγμένων καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Αλλαγή αρίθμησης κατάδυσης(-σεων) </translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Μετακίνηση χρόνων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Διαχωρισμός επιλεγμένων καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Φόρτωση εικόνας(-ων) από αρχείο(-α)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Φόρτωση εικόνας από το διαδίκτυο</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>το %1 δεν φαίνεται να είναι εικόνα</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Άνοιγμα αρχείων εικόνων</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>το %1 δεν φαίνεται να είναι εικόνα</translation> </message> </context> <context> @@ -2552,7 +2599,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Φωτισμός</translation> </message> @@ -2562,121 +2609,121 @@ GPS location:</source> <translation>Άμμος</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Γενικευμένη μορφή που χρησιμοποιείται για την ανταλλαγή δεδομένων μεταξύ μίας πληθώρας καταδυτικών προγραμμάτων. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Τιμές διαχωρισμένες με κόμμα που περιγράφουν το γράφημα της κατάδυσης.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Τιμές διαχωρισμένες με κόμμα των πληροφοριών της κατάδυσης. Περιλαμβάνουν την πλειοψηφία των λεπτομερειών της κατάδυσης αλλά όχι τις πληροφορίες του γραφήματος. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Αποστολή των δεδομένων της κατάδυσης στη ιστοσελίδα divelogs.de . </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Αποστολή των δεδομένων της κατάδυσης στη ιστοσελίδα dive-share.appspot.com. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML εξαγωγή των καταδυτικών τοποθεσιών, οι οποίες προβάλλονται σε παγκόσμιο χάρτη.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Εγγενής μορφή XML του Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Εγγραφή βάθους λήψης των εικόνων σε αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Εγγραφή κατάδυσης ως μακροεντολή TeX σε αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Εξαγωγή αρχείου UDDF ως</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Εξαγωγή αρχείου CSV ως</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Εξαγωγή παγκόσμιου χάρτη</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Εξαγωγή Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Αποθήκευση βάθους λήψης των εικόνων</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Εξαγωγή σε αρχείο TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Εξαγωγή αρχείου HTML ως</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Παρακαλώ περιμένετε, γίνεται εξαγωγή...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Αδυναμία ανοίγματος του αρχείου %s </translation> </message> @@ -3036,62 +3083,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Τελικό Βάθος</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Χρόνος από την έναρξη της κατάδυσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Μείγμα χρήσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>Καθορισμένη Τιμή Κλειστού Κυκλώματος</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Λειτουργία κατάδυσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>λεπτά</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3296,260 +3343,266 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Μείγμα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Μέγιστη τοξικότητα Κεντρικού Νευρικού Συστήματος</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Ετικέτες</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Φωτογραφίες</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Χώρα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Καταδυτικό ζευγάρι</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Βάθος(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Βάρος(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>Κατανάλωση Αέρα στην Επιφανεία(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Φωτογραφίες πριν/κατά τη διάρκεια/μετά την κατάδυση </translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>καμία κατάδυση δεν έχει επιλεγεί</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Η διαμόρφωση φύλλου για εξαγωγή στο divelogs.de δεν βρέθηκε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>αποτυχία δημιουργίας συμπιεσμένου αρχείου για μεταφόρτωση: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>εσωτερικό σφάλμα</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Η μετατροπή της κατάδυσης %1 στη μορφή divelogs.de απέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>σφάλμα εγγραφής συμπιεσμένου αρχείου: %s σφάλμα συμπίεσης %d σφάλμα συστήματος %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Μεταφόρτωση λίστας καταδύσεων...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Λήψη λίστας καταδύσεων...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Λήψη %1 καταδύσων...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Η λήψη τελείωσε - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Πρόβλημα με την λήψη</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Το αρχείο αυτό δεν μπόρεσε να ανοιχθεί</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Κατεστραμμένη λήψη</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Η μεταφόρτωση τελείωσε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Η μεταφόρτωση απέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Η μεταφόρτωση πέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Δεν μπορεί να αναλυθεί η απάντηση </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Σφάλμα: %1</translation> </message> @@ -3557,23 +3610,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Λήψη</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Επιλέξτε τρόπο λήψης πρωτοκόλλου Bluetooth </translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Σφάλμα</translation> </message> @@ -3583,42 +3636,47 @@ p, li { white-space: pre-wrap; } <translation>Εύρεση καταδυτικού υπολογιστή UEMIS</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> @@ -3690,9 +3748,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Λήψη</translation> </message> @@ -3718,7 +3776,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> @@ -3733,57 +3791,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Επωνυμία προμηθευτή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Καταδυτικός υπολογιστής:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Επαναπροσπάθεια</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Παραίτηση</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Ληφθείσες καταδύσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Επιλογή όλων</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Αποεπιλογή Όλων</translation> </message> @@ -3814,12 +3878,12 @@ p, li { white-space: pre-wrap; } <translation>Σύνδεση με το κείμενο δοκιμής του Facebook </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Για να αποσυνδέσετε το Subsurface από τον λογαριασμό σας στο Facebook, χρησιμοποιήστε την επιλογή του καταλόγου 'Κοινοποίηση'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Για να συνδεθείτε με το Facebook, παρακαλώ εισάγεται τα διαπιστευτήριά σας. Αυτό επιτρέπει στο Subsurface να δημοσιεύσει καταδύσεις στο χρονολόγιό σας</translation> </message> @@ -3827,22 +3891,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3858,17 +3922,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Επιλογή όλων</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Αποεπιλογή Όλων</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3923,17 +3987,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3949,8 +4013,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Εξερεύνηση αρχείων εικόνων</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3964,17 +4028,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4067,40 +4131,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Τοποθεσία:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Τοποθεσία</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(ίδια θέση GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 μακριά</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n κατάδυση(ύσεις) εδώ)</numerusform><numerusform>, %n κατάδυση(ύσεις) εδώ)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(δεν υφίστανται δεδομένα GPS, προσθήκη θέσεων GPS από αυτή την κατάδυση)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(δεν υπάρχουν δεδομένα GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Επιλογή θέσης κατάδυσης:</translation> </message> @@ -4108,7 +4172,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Δεν καθορίσθηκε τοποθεσία</translation> </message> @@ -4233,8 +4297,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> @@ -4255,19 +4319,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Θερμοκρασία Νερού</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -4348,8 +4412,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Φωτογραφίες</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4382,53 +4446,53 @@ p, li { white-space: pre-wrap; } <translation>Προσθήκη συστήματος βαρών</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Θερμοκρασία ατμόσφαιρας [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Θερμοκρασία νερού [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Σημειώσεις ταξιδιού</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Τοποθεσία ταξιδιού</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Νέα θέση κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Απόρριψη των αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Πρόκειται να απορρίψετε τις αλλαγές σας. </translation> </message> @@ -4461,424 +4525,419 @@ p, li { white-space: pre-wrap; } <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Επεξεργασία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Κοινοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Νέο</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Αποθήκευση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Αποθήκευση ως</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Αποθήκευση ως...</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Έ&ξοδος</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Κλείσιμο</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Εκτύ&πωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Προτιμήσεις</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Έ&ξοδος</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Εισαγωγή από &υπολογιστή κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Εισαγωγή δεδομένων &GPS από την υπηρεσία διαδικτύου του Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Επεξεργασία συσκευής & ονομάτων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Προσθήκη κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Επεξεργασία κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Αντιγραφή στοιχείων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Επικόλληση στοιχείων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>Επ&αναρίθμηση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Αυτόματη &ομαδοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Κατάλογος καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Γράφημα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Πληροφορίες</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Όλα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Προηγούμενος καταδυτικός υπολογιστής</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Επόμενος καταδυτικός υπολογιστής </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Σχετικά με το Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Εγχειρίδιο &χρήσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Σχεδιασμός κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Εισαγωγή αρχείων καταγραφής</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Εισαγωγή αρχείων λογισμικού καταχώρησης καταδύσεων από άλλες εφαρμογές</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Εισαγωγή από το divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Πλήρης οθόνη</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Εμφάνιση πλήρους οθόνης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Έλεγχος για ενημερώσεις</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Εξαγωγή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Εξαγωγή αρχείων καταγραφής κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Διαμόρφωση καταδυτικού υπολογιστή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Επεξεργασία κατάδυσης στον σχεδιαστή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Εμφάνιση γραφήματος pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Εμφάνιση γραφήματος pΝ₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Εμφάνιση γραφήματος pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Εμφάνιση βάθους ασφαλούς ανάδυσης από τον καταδυτικό υπολογιστή</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Εμφάνιση υπολογισμένου βάθους ασφαλούς ανάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Εμφάνιση υπολογισμού όλων των ιστών</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Εμφάνιση υπολογισμένου βάθους ασφαλούς ανάδυσης με επαυξήσεις 3 μέτρων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Εμφάνιση καρδιακών παλμών</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Εμφάνιση μέγιστου λειτουργικού βάθους</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Εμφάνιση Ισοδύναμου Βάθους Αέρα, Ισοδύναμου Βάθους Νάρκωσης και Ισοδύναμου Βάθους Πυκνότητας Αέρα </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Εμφάνιση Ορίου Μη Αποσυμπίεσης, Συνολικού Χρόνου Μέχρι την Επιφάνεια </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Εμφάνιση ρυθμού Κατανάλωσης Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Εμφάνιση χάρακα</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Κλιμάκωση γραφήματος</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Εμφάνιση εικόνων</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Εισαγωγή φίλτρου στον κατάλογο καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Εμφάνιση αποτύπωσης θερμοκρασίας ιστών</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Ερωτηματολόγιο χρήστη</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Αναίρεση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Άρση αναίρεσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Εύρεση εικόνων που μετακινήθηκαν</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Άνοιγμα αποθηκευτικού νέφους </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Αποθήκευση στο αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Διαχείριση θέσεων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Επεξεργασία θέσης κατάδυσης </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Σύνδεση με</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Αποσύνδεση από</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Άνοιγμα αρχείου</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4892,213 +4951,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Εκτύπωση πίνακα ολικού χρόνου κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Προσπάθεια να επανασχεδιαστεί μία κατάδυση που δεν ήταν μια σχεδιασμένη κατάδυση. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Παρακαλώ πρώτα τελειώστε την τρέχουσα επεξεργασία πριν προσπαθήσετε να επεξεργαστείτε εκ νέου. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Θέλετε να αποθηκευτούν οι αλλαγές στο αρχείο %1;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Θέλετε να αποθηκευθούν οι αλλαγές στο αρχείο δεδομένων;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Αποθήκευση αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Αποθήκευση αρχείου ως</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[τοπική κρυφή μνήμη για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[αποθήκευση στο αποθηκευτικό νέφος για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Άνοιγμα αρχείου δεδομένων από παλαιότερη έκδοση </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Ανοίξατε ένα αρχείο δεδομένων μίας παλαιότερης έκδοσης του Subsurface. Προτείνεται να συμβουλευτείτε το εγχειρίδιο χρήσης για να μάθετε για τις διαφοροποιήσεις της καινούργιας έκδοσης, ιδιαίτερα στην διαχείριση των καταδυτικών θέσεων η οποία έχει αλλάξει σε μεγάλο βαθμό. Το Subsurface ήδη επιχείρησε να συμπληρώσει τα δεδομένα, αλλά προτείνεται να αφιερώσετε κάποιο χρόνο στο νέο σύστημα διαχείρισης των καταδυτικών θέσεων και να βεβαιωθείτε ότι όλα είναι σωστά.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Άνοιγμα αρχείου καταγραφής κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Επικοινωνία με την υπηρεσία αποθηκευτικού νέφους... </translation> </message> @@ -5154,7 +5213,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Το φίλτρο δείχνει %1 (από %2) καταδύσεις</translation> </message> @@ -5162,12 +5221,12 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Πρέπει να ενημερώσετε το υλικολογισμικό στον καταδυτικό σας υπολογιστή, έχετε την έκδοση %1 αλλά η τελευταία σταθερή έκδοση είναι η %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5176,27 +5235,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Αν η συσκευή σας χρησιμοποιεί Bluetooth, κάντε τις ίδιες προετοιμασίες όπως πριν την λήψη ενός βιβλίου καταγραφής κατάδυσης, προτού να συνεχίσετε με την ενημέρωση</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Όχι τώρα </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Ενημέρωση υλικολογισμικού </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Ειδοποίηση ενημέρωσης υλικολογισμικού</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Αποθήκευση ληφθέντος υλικολογισμικού ως</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5334,8 +5393,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Μη προεπιλεγμένο αρχείο</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5359,6 +5418,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5389,29 +5449,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Εκκαθάριση όλων των ρυθμίσεων</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Επαναφορά όλων των ρυθμίσεων στις προεπιλεγμένες τιμές </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Άνοιγμα προεπιλεγμένου αρχείου καταγραφής</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5566,7 +5651,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5606,7 +5691,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Προβολή μέσου βάθους στο γράφημα</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Προφίλ</translation> </message> @@ -5685,25 +5770,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Κυριολεκτικοί χαρακτήρες</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5754,7 +5839,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Αποθήκευση νέφους Subsurface</translation> </message> @@ -5779,73 +5864,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Τοπική αποθήκευση συνθηματικού; </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Υπηρεσία δικτύου Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Προεπιλεγμένη ταυτότητα χρήστη</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Τοπική αποθήκευση ταυτότητας χρήστη; </translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Δίκτυο</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Χωρίς διακομιστή διαμεσολάβησης</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Διακομιστή διαμεσολάβησης συστήματος</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Διακομιστής διαμεσολάβησης HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Διακομιστής διαμεσολάβησης SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Η διεύθυνση ηλεκτρονικού ταχυδρομείου και το συνθηματικό του αποθηκευτικού νέφους μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και '.', '-', '_', και '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Αποθήκευση νέφους Subsurface (τα διαπιστευτήρια εξακριβώθηκαν) </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6173,133 +6243,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation>(#%1 από %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Άγνωστος καταδυτικός υπολογιστής</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Η εμφάνιση του Ορίου Μη Αποσυμπίεσης / Συνολικού Χρόνου Μέχρι την Επιφάνεια, απενεργοποιήθηκε λόγω υπέρμετρου χρόνου επεξεργασίας</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Προσθήκη αλλαγής μείγματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(φιάλη %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Προσθήκη σελιδοδείκτη</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Επεξεργασία του γραφήματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Αφαίρεση συμβάντος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Απόκρυψη παρόμοιων συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Επεξεργασία ονόματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Απόκρυψη όλων των %1 συμβάντων;</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Επεξεργασία ονόματος σελιδοδείκτη</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Ειδικό όνομα:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Το όνομα είναι πολύ μεγάλο! </translation> </message> @@ -6307,53 +6377,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Έναρξη...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>εργασία εκτός αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Δεν υπάρχουν διαπιστευτήρια νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Παρακαλώ εισάγετε έγκυρα διαπιστευτήρια νέφους </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Η διεύθυνση ηλεκτρονικού ταχυδρομείου και το συνθηματικό του αποθηκευτικού νέφους μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και '.', '-', '_', και '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6403,50 +6473,50 @@ Please export this template to a different file.</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Σφάλμα αποθήκευσης στο αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Αποτυχία σύνδεσης με τον διακομιστή του αποθηκευτικού νέφους, επαναφορά σε καθεστώς λειτουργίας χωρίς αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Το αποθηκευτικό νέφος ανοίχθηκε με επιτυχία. Δεν υπάρχουν καταδύσεις στον κατάλογο καταδύσεων. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>ώρα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Άγνωστη θέση GPS</translation> </message> @@ -6454,7 +6524,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Έναρξη...</translation> </message> @@ -6546,116 +6616,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Ρυθμίσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Διεύθυνση ηλεκτρονικού ταχυδρομείου </translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Θέμα</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Μπλε</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Υπηρεσία δικτύου Subsurface δεδομένων GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Όριο απόστασης (μέτρα)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Όριο χρόνου (minutes)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Προεπιλεγμένη Φιάλη</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Φιάλη:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Υπεύθυνος ανάπτυξης </translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6690,16 +6770,14 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Προειδοποίηση! -Δεν υπάρχουν σε όλες της εικόνες χρονοσημάνσεις στο διάστημα μεταξύ -30 λεπτών πριν την έναρξη και 30 λεπτών πριν την λήξη της οποιασδήποτε επιλεγμένης κατάδυσης.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Φόρτωση εικόνων ακόμα και αν οι χρόνοι λήψης δεν συμπίπτουν με τους χρόνους κατάδυσης</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6722,38 +6800,38 @@ Not all images have timestamps in the range between <translation>Ποιά ημερομηνία και ώρα προβάλετε στην εικόνα; </translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Άνοιγμα αρχείων εικόνας</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6846,28 +6924,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Άνοιγμα αρχείων SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Άνοιγμα αρχείων Subsurface</translation> </message> @@ -6875,64 +6953,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Μέσο</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Καταδυτικά δεδομένα: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Διάρκεια: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ώρα</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Τοποθεσία κατάδυσης: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Καταδυτικό ζευγάρι: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7069,65 +7147,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Εισάγετε την ταυτότητα χρήστη και πιέστε Λήψη </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Σύνδεση...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Η λήψη τελείωσε</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Σφάλμα λήψης: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Σφάλμα επικοινωνίας:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Άκυρος έλεγχος χρήστη!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Δεν μπορεί να αναλυθεί η απάντηση!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Επιτυχής λήψη</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Στολές:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Δεν καθορίσθηκε στολή</translation> </message> @@ -7258,39 +7288,44 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Φόρτωση εικόνας(-ων) από αρχείο(-α)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Φόρτωση εικόνας(ων) από το διαδίκτυο</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Διαγραφή επιλεγμένων εικόνων</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Διαγραφή όλων των εικόνων </translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Διαγραφή εικόνων </translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Σίγουρα θέλετε να διαγράψετε όλες τις εικόνες;</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7457,15 +7492,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Ετικέτες:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Ετικέτες</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Άδειες ετικέτες</translation> </message> @@ -7664,7 +7699,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1πιέστε για να επισκεφθείτε %2</translation> </message> @@ -7688,130 +7723,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 προβάλετε)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Βάθος(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Ετικέτες</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Καταδυτικό ζευγάρι</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>ώρα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>λεπτά</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Βάρος(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Μείγμα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>Κατανάλωση Αέρα στην Επιφανεία(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Φωτογραφίες πριν/κατά τη διάρκεια/μετά την κατάδυση </translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Χώρα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -7825,81 +7865,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Εισάγετε URL για εικόνες</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Έλεγχος για ενημερώσεις.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Το Subsurface δεν μπόρεσε να ελέγξει για ενημερώσεις.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Προέκυψε το παρακάτω σφάλμα:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Παρακαλώ ελέγξτε την σύνδεσή σας στο διαδίκτυο </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Χρησιμοποιείται την τελευταία έκδοση του Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Μία νέα έκδοση του Subsurface είναι διαθέσιμη.<br/>Πιέστε στο:<br/><a href="%1">%1</a><br/> για να την λάβετε.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Μία νέα έκδοση του Subsurface είναι διαθέσιμη.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Η τελευταία έκδοση είναι %1, παρακαλώ ελέγξτε %2 από την σελίδα λήψεων %3 για πληροφορίες στο πως να ενημερώσετε.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Η νεότερη έκδοση που κυκλοφορεί είναι η </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Ο διακομιστής επέστρεψε την ακόλουθη πληροφορία:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Το Subsurface ελέγχει κάθε δύο εβδομάδες για το αν μια νέα έκδοση είναι διαθέσιμη. Αν δεν επιθυμείτε το Subsurface να συνεχίσει να ελέγχει, παρακαλώ πιέστε Απόρριψη.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Απόρριψη</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Αυτόματος έλεγχος για ενημερώσεις</translation> </message> @@ -8075,6 +8115,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8130,12 +8183,12 @@ Language: %1</source> <translation>Μεταφόρτωση</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Operation timed out</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Μεταφορά δεδομένων...</translation> </message> @@ -8161,8 +8214,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Χωρίς σφάλμα</translation> </message> @@ -8285,7 +8338,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Σφάλμα στην ανάλυση της κεφαλίδας</translation> </message> @@ -8621,9 +8674,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>οξυγόνο</translation> </message> @@ -8638,131 +8691,131 @@ Maximum</source> <translation>Ανοιχτό κύκλωμα </translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>αέρας</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>ενσωματωμένα</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>ζώνη</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>αστραγάλου</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8839,123 +8892,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Ο κατάλογος %s της τοπικής κρυφής μνήμης έχει αλλοιωθεί - δεν είναι δυνατός ο συγχρονισμός με το αποθηκευτικό νέφος του Subsurface </translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Δεν έγινε η ενημέρωση της τοπικής κρυφής μνήμης στα πλέον καινούργια απομακρυσμένα δεδομένα </translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Το αποθηκευτικό νέφος Subsurface έχει αλλοιωθεί</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Δεν έγινε η ενημέρωση της αποθήκευσης αποθηκευτικού νέφους του Subsurface, παρακαλώ δοκιμάστε αργότερα </translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Υπάρχει διαφοροποίηση μεταξύ των τοπικών και απομακρυσμένων δεδομένων. Σφάλμα: η συγχώνευση απέτυχε (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Υπάρχει διαφοροποίηση μεταξύ των τοπικών και απομακρυσμένων δεδομένων. Δεν συνδυάζονται η τοπικές και απομακρυσμένες αλλαγές</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Υπάρχει διαφοροποίηση μεταξύ των τοπικών και απομακρυσμένων δεδομένων</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Υπάρχει διαφοροποίηση μεταξύ των τοπικών και απομακρυσμένων δεδομένων. Σφάλμα: η εγγραφή των δεδομένων απέτυχε (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Προβλήματα με την τοπική κρυφή μνήμη των δεδομένων του αποθηκευτικού νέφους Subsurface </translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Μετακίνηση δεδομένων τοπικής κρυφής μνήμης στο %s. Παρακαλώ προσπαθήστε ξανά.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Σφάλμα κατά την σύνδεση με το αποθηκευτικό νέφος Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Η κλωνοποίηση git του %s απέτυχε (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9054,131 +9107,131 @@ Maximum</source> <translation>άκυρος αριθμός συμβάντος</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Σφάλμα στην ημερομηνία</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Κατάδυση %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Σφάλμα στο μέγιστο βάθος</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Σφάλμα στην ανάλυση της θερμοκρασίας</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Σφάλμα στον αριθμό των αερίων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Σφάλμα στην πρόσκτηση της αλατότητας</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Σφάλμα στην πρόσκτηση της πίεσης επιφανείας</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Σφάλμα στο μίγμα αερίων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Αδύνατον να αναλυθεί το %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>πολλαπλές τοποθεσίες GPS για αυτή την καταδυτική θέση, επίσης %s @@ -9186,19 +9239,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>επιπρόσθετο όνομα για την θέση κατάδυσης: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9221,12 +9274,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Σφάλμα στην ανάλυση του '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> @@ -9257,8 +9310,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, αποτελεσματικός Αναλογικός Συντελεστής Αποσυμπίεσης=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Αλλαγή Καθορισμένης Τιμής </translation> </message> @@ -9520,17 +9573,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>χαμηλή τιμή pO₂ %.2f σε %d:%02u με μείγμα %s σε βάθος %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Δεν βρίσκεται το μέιγμα %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9539,142 +9592,142 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>Κατανάλωση Αέρα στην Επιφάνεια: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>Τοξικότητα Κεντρικού Νευρικού Συστήματος: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>Μέγιστο Λειτουργικό Βάθος: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Αποσυμπίεση: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Ανάγκη αποσυμπίεσης </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>Όριο Μη Αποσυμπίεσης: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>Χρόνος Μέχρι την Επιφάνεια: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Αποσυμπίεση: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Ανάγκη αποσυμπίεσης (calc) @@ -9682,117 +9735,117 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>Όριο Μη Αποσυμπίεσης: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>Όριο Μη Αποσυμπίεσης: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>Χρόνος Μέχρι την Επιφάνεια: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>Χρόνος Μέχρι την Επιφάνεια: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>Χρόνος στον Βυθό που Απομένει: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Υπολογισμένο βάθος ασφαλούς ανάδυσης %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ιστός %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>διόπτευση: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>μέσο βάθος μέχρι εδώ %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9841,142 +9894,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>ΑΕΡΑΣ</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>Εμπλουτισμένο μείγμα Nitrox</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>ΟΞΥΓΟΝΟ</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Αδυναμία ανοίγματος του αρχείου %s </translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Αριθμός</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Θερμοκρασία Νερού</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Καταδύσεις</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Επέκταση όλων</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Σύμπτυξη όλων</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Ταξίδια</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Στατιστικά στοιχεία</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Προχωρημένη αναζήτηση</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Ορατότητα</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Ζευγάρι</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Στολή</translation> </message> @@ -9987,180 +10040,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Ετικέτες</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Προβολή περισσότερων λεπτομερειών</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Έτος</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Συνολική διάρκεια</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Μέσος χρόνος</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Συντομότερος χρόνος</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Μεγαλύτερος χρόνος</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Μέσο βάθος</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Ελάχιστο βάθος</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Μέγιστο Βάθος</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Μέση Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Ελάχιστη Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Μέγιστη Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Μέση θερμοκρασία</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Ελάχιστη θερμοκρασία</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Μέγιστη θερμοκρασία</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Επιστροφή στον κατάλογο</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Κατάδυση #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Καταδυτικό γράφημα</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Πληροφορίες κατάδυσης</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Καταδυτικός εξοπλισμός</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Τύπος</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Μέγεθος</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Πίεση γεμίσματος</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Πίεση στην αρχή</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Πίεση στο τέλος</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Μείγμα</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Συμβάντα</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Όνομα</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Τιμή</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Συντεταγμένες</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Κατάσταση κατάδυσης</translation> </message> @@ -10190,62 +10243,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Ιαν</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Φεβ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Μαρ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Απρ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Μαι</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Ιουν</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Ιουλ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Αυγ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Σεπ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Οκτ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Νοε</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Δεκ</translation> </message> @@ -10494,12 +10547,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Μέγιστο βάθος:</translation> @@ -10525,77 +10583,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Σημειώσεις:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Κατασκευή</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Βύθιση</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Λόγος</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Εθνικότητα</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Ναυπηγείο</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Τύπος σκάφους</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Μήκος</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Πλάτος σκάφους</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Βύθισμα σκάφους</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Εκτόπισμα</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Φορτίο</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Δεδομένα ναυάγιου</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Υψόμετρο</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Βάθος</translation> </message> @@ -10640,27 +10698,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Πόλη</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10675,7 +10733,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Αφαίρεση αυτού του σημείου</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10695,22 +10753,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Μέγιστο</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Άκυρη απάντηση από τον διακομιστή</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Αντί της αναμενόμενης ετικέτας XML 'DiveDateReader', εμφανίστηκε '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Expected XML tag 'DiveDates' not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Παραμορφωμένη απάντηση XML. Γραμμή %1: %2</translation> </message> @@ -10723,112 +10781,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Φορητό Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Κατάλογος καταδύσεων</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Ενεργοποίηση αυτόματου συγχρονισμού αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Ρυθμίσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Προσθήκη κατάδυσης μη αυτόματα</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Μη αυτόματος συγχρονισμός με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Μεταφόρτωση δεδομένων GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Λήψη δεδομένων GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Προβολή στοιχείων θέσεων GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Εκκαθάριση τοπικής κρυφής μνήμης GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Υπεύθυνος ανάπτυξης </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Αρχείο καταγραφής δεδομένων εφαρμογής </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Πληροφορίες θέματος εμφάνισης</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Σχετικά</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Εκτέλεση υπηρεσίας τοποθεσίας</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 39461d3e3..47bcc0937 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -167,160 +167,160 @@ <translation>Scanning for remote devices...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Scanning finished successfully.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>The local Bluetooth device was %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>turned on</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>turned off</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORISED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [State: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>The device %1 can be used for connection. You can press the Save button.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>A device needs a non-zero address for a connection.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>The local device was changed.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Pair</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Remove pairing</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Trying to pair device %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Trying to unpair device %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Device %1 was unpaired.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Device %1 was paired.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Device %1 was paired and is authorised.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>The device %1 can now be used for connection. You can press the Save button.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Local device error: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Unknown error</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>The Bluetooth adaptor is powered off, power it on before doing discovery.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Writing to or reading from the device resulted in an error.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>An unknown error has occurred.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Device discovery error: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Not available</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>The local Bluetooth adapter cannot be accessed.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Person: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Searches for buddies and divemasters</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>No buddies</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Backup dive computer settings</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Backup files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML backup error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>An error occurred while saving the backup file. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup succeeded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Your settings have been saved to: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Restore dive computer settings</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML restore error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>An error occurred while restoring the backup file. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Restore succeeded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Your settings have been restored successfully.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Select firmware file</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>All files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Log files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Connecting to device...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Connected to device</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Disconnected from device</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Choose logfile for dive computer download</translation> </message> @@ -1973,22 +1973,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Dive details</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Delete dive</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Cancel edit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Show on map</translation> </message> @@ -1996,104 +1996,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Dive %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Date:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordinates:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Use current GPS location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Depth:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Duration:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Cylinder:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Cylinder1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Start Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>End Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Cylinder2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Cylinder3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Cylinder4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Cylinder5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibility:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notes:</translation> </message> @@ -2262,104 +2294,119 @@ GPS location:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Shift dive times</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Split selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Load image(s) from file(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Load image from web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Image files (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Open media files</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 does not appear to be an image</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Media files</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Image files</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Open image files</translation> + <source>Video files</source> + <translation>Video files</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>All files</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 does not appear to be an image</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS location:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Light</translation> </message> @@ -2570,121 +2617,121 @@ GPS location:</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Generic format that is used for data exchange between a variety of diving related programs.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Comma separated values describing the dive profile.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Comma separated values of the dive information. This includes most of the dive details but no profile information.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send the dive data to divelogs.de website.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Send the dive data to dive-share.appspot.com website.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML export of the dive locations, visualised on a world map.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface native XML format.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Write depths of images to file.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Write dive as TeX macros to file.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Export UDDF file as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF files</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX files</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Export CSV file as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Export world map</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Export Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Save image depths</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Export to TeX file</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Export HTML files as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Please wait, exporting...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> @@ -3044,62 +3091,62 @@ GPS location:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>cyl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Dive mode</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Stop times</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Photos</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Media</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Photos before/during/after dive</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Media before/during/after dive</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>no dives were selected</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>stylesheet to export to divelogs.de is not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>failed to create zip file for upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>internal error</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Conversion of dive %1 to divelogs.de format failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>error writing zip file: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problem with download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>The archive could not be opened: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Choose Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Connecting to dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Error</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Find Uemis dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Find Garmin dive computer</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Cancel download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Choose logfile for dive computer download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Log files</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Choose file for dive computer binary dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Dump files</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Retry download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Download</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth is not enabled</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation> Vendor name: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>USB device</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation> Dive Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation> Connection:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Rescan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation> Downloaded dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Connect to Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Facebook logged in successfully</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, unknown user id, cannot login.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Dive uploaded successfully to Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Dive upload failed. Please see debug output and send to Subsurface mailing list</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Select all</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Unselect all</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Invert selection</translation> </message> @@ -3932,59 +3996,59 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation type="unfinished"/> + <source>Find moved media files</source> + <translation>Find moved media files</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation type="unfinished"/> + <source>Found media files</source> + <translation>Found media files</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation type="unfinished"/> + <source>Match only media files in selected dive(s)</source> + <translation>Match only media files in selected dive(s)</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> <source>Scanning:</source> - <translation type="unfinished"/> + <translation>Scanning:</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> <source>Select folder and scan</source> - <translation type="unfinished"/> + <translation>Select folder and scan</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Traverse image directories</translation> + <source>Traverse media directories</source> + <translation>Traverse media directories</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> <source>Stop scanning</source> - <translation type="unfinished"/> + <translation>Stop scanning</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation type="unfinished"/> + <translation>Scanning cancelled - results may be incomplete</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation type="unfinished"/> + <source>No matching media files found</source> + <translation>No matching media files found</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation type="unfinished"/> + <source>Found <b>%1</b> media files at their current place.</source> + <translation>Found <b>%1</b> media files in their current place.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation type="unfinished"/> + <source>Found <b>%1</b> media files at new locations:</source> + <translation>Found <b>%1</b> media files in new locations:</translation> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Location: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Location</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (same GPS fix)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 away</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dive here)</numerusform><numerusform>, %n dives here)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(no existing GPS data, add GPS fix from this dive)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(no GPS data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Pick site: </translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>No location set</translation> </message> @@ -4242,8 +4306,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -4264,19 +4328,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Location</translation> </message> @@ -4357,8 +4421,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Photos</translation> + <source>Media</source> + <translation>Media</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ p, li { white-space: pre-wrap; } <translation>Add weight system</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -4470,424 +4534,419 @@ p, li { white-space: pre-wrap; } <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Edit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Share on</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>New</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Sa&ve as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Save as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Close</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Close</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&references</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Quit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Import from &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Import &GPS data from Subsurface web service</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Edit device &names</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Add dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Edit dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copy dive components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Paste dive components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renumber</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Auto &group</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Dive list</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profile</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&All</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>P&revious DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Next DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&About Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>User &manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Map</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lan dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Import log files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Import divelog files from other applications</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Import &from divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Full screen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Toggle full screen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Check for updates</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Export dive logs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configure &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Edit &dive in planner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Toggle pO₂ graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Toggle pN₂ graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Toggle pHe graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Toggle DC reported ceiling</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Toggle calculated ceiling</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Toggle calculating all tissues</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Toggle calculated ceiling with 3m increments</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Toggle heart rate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Toggle MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Toggle EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Toggle NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Toggle SAC rate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Toggle ruler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Scale graph</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Toggle pictures</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Toggle media</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>&Find moved media files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Toggle gas bar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filter divelist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Toggle tissue heat-map</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>User &survey</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Redo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Find moved images</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Open c&loud storage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Save to clo&ud storage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Manage dive sites</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Dive site &edit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Trying to merge dives with %1min interval between them</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Template backup created</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,214 +4969,214 @@ are read-only and should not be edited directly, since the application can overwrite them on startup.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Please save or cancel the current dive edit before going online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>You have unsaved changes. Do you want to commit them to cloud storage now? If you answer no, the cloud will only be synced next time you "Open cloud storage" or "Save to cloud storage".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Failure taking cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Please save or cancel the current dive edit before closing the file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Dive log files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>All files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -5174,7 +5233,7 @@ The QML modules QtPositioning and QtLocation could be missing!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter shows %1 (of %2) dives</translation> </message> @@ -5182,12 +5241,12 @@ The QML modules QtPositioning and QtLocation could be missing!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5196,27 +5255,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Not now</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Update firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmware upgrade notice</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Save the downloaded firmware as</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware files</translation> </message> @@ -5354,8 +5413,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>No default file</translation> + <source>&No default file</source> + <translation>&No default file</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5379,6 +5438,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5409,29 +5469,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Video thumbnails</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>ffmpeg executable</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Extract in folder</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Extract video thumbnails</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Clear all settings</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Reset all settings to their default value</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Open default log file</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Select ffmpeg executable</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5586,8 +5671,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Recalculate thumbnails if older than image</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Recreate thumbnails if older than media file</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5626,7 +5711,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Show mean depth in Profile</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profile</translation> </message> @@ -5705,27 +5790,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>To correctly load a new language you must restart Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>These will be used as-is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Literal characters</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Non-special character(s) in time format. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Non-special character(s) in date format. @@ -5777,7 +5862,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface cloud storage</translation> </message> @@ -5802,73 +5887,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Save password locally?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface web service</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Default user ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Save user ID locally?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Network</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>No proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface cloud storage (credentials verified)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface cloud storage (incorrect password)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface cloud storage (PIN required)</translation> </message> @@ -6197,133 +6267,133 @@ Please export this template to a different file.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Make default dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Planned dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Manually added dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Add setpoint change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> - <translation type="unfinished"/> + <translation>Split dive into two</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Change dive mode</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Adjust pressure of cyl. %1 (currently interpolated as %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -6331,53 +6401,53 @@ Please export this template to a different file.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> @@ -6427,50 +6497,50 @@ Please export this template to a different file.</translation> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud storage open successfully. No dives in dive list.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6478,7 +6548,7 @@ Please export this template to a different file.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Starting...</translation> </message> @@ -6570,116 +6640,126 @@ Please export this template to a different file.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Settings</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Undefined</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Incorrect username/password combination</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Credentials need to be verified</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Credentials verified</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>No cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Cloud status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Not applicable</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Change</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Theme</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blue</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>regular text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Highlight</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Pink</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Dark</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS data webservice</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Distance threshold (meters)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Time threshold (minutes)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Default Cylinder</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Cylinder:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Display developer menu</translation> </message> @@ -6714,16 +6794,16 @@ Please export this template to a different file.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range 30 minutes before the start and 30 minutes after the end of any selected dive.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Load images even if the time does not match the dive time</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Load media files even if the time does not match the dive time</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6746,39 +6826,39 @@ Not all images have timestamps in the range between <translation>Which date and time are displayed on the image?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Open image file</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Image files</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Selected dive date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>First selected dive date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Last selected dive date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Files with inappropriate date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>No Exif date/time found</translation> </message> @@ -6871,28 +6951,28 @@ Files with inappropriate date/time</translation> <translation>Import messages (errors, warnings, etc)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Open SmartTrak files</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak files</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>All files</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Open Subsurface files</translation> </message> @@ -6900,64 +6980,64 @@ Files with inappropriate date/time</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Small</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dive date: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duration: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dive location: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7094,65 +7174,17 @@ Files with inappropriate date/time</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Enter User ID and click download</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Connecting...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Download finished</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Download error: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Connection error: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Invalid user identifier.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Cannot parse response.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Download successful</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Suits: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>No suit set</translation> </message> @@ -7283,39 +7315,44 @@ Files with inappropriate date/time</translation> <translation>Zoom level</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Load image(s) from file(s)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Load image(s) from web</translation> + <source>Load media from file(s)</source> + <translation>Load media from file(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Delete selected images</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Load media file(s) from web</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Delete all images</translation> + <source>Delete selected media files</source> + <translation>Delete selected media files</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Delete all media files</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Open folder of selected media files</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Recalculate selected thumbnails</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Deleting Images</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>Deleting media files</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Are you sure you want to delete all images?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Are you sure you want to delete all media files?</translation> </message> </context> <context> @@ -7483,15 +7520,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Tags: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Tags</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Empty tags</translation> </message> @@ -7690,7 +7727,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1click to visit %2</translation> </message> @@ -7714,130 +7751,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 shown)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Media before/during/after dive</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Photos before/during/after dive</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Location</translation> </message> @@ -7851,81 +7893,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Enter URL for images</translation> + <source>Enter URL for media files</source> + <translation>Enter URL for media files</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Check for updates.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface was unable to check for updates.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>You are using the latest version of Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>A new version of Subsurface is available.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Latest version is %1, please check %2 our download page %3 for information in how to update.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Newest release version is </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>The server returned the following information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface checks every two weeks to see if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Decline</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automatic check for updates</translation> </message> @@ -8101,6 +8143,19 @@ Language: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>ffmpeg failed to start - video thumbnail creation suspended</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>failed waiting for ffmpeg - video thumbnail creation suspended</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8156,12 +8211,12 @@ Language: %1</translation> <translation>Upload</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Operation timed out</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Transferring data...</translation> </message> @@ -8187,8 +8242,8 @@ Language: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>No error</translation> </message> @@ -8312,7 +8367,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Error parsing the header</translation> </message> @@ -8649,9 +8704,9 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8666,131 +8721,131 @@ Maximum</translation> <translation>Open circuit</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrated</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>belt</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>ankle</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8867,123 +8922,123 @@ Maximum</translation> <translation>No dive profile found from '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Checkout from storage (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transfer from storage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transfer to storage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Could not update local cache to newer remote data</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface cloud storage corrupted</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Could not update Subsurface cloud storage, try again later</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Remote storage and local data diverged. Error: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Remote storage and local data diverged. Cannot combine local and remote changes</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Remote storage and local data diverged</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Remote storage and local data diverged. Error: writing the data failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problems with local cache of Subsurface cloud data</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Moved cache data to %s. Please try the operation again.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Update local storage to match cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Push local changes to cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Try to merge local changes into cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Store data into cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sync with cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Can't reach cloud server, working with local data</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Successful cloud connection, fetch remote</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Done syncing with cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Error connecting to Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Synchronising data file</translation> </message> @@ -9082,119 +9137,119 @@ Maximum</translation> <translation>invalid event number</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Error parsing temperature</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Error obtaining dive mode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Already downloaded dive at %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9203,13 +9258,13 @@ In most cases, in order to debug this issue, a libdivecomputer logfile will be u You can create this logfile by selecting the corresponding checkbox in the download dialog.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>No new dives downloaded from dive computer</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s @@ -9217,19 +9272,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>additional name for site: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Load dives from local cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Successfully opened dive data</translation> </message> @@ -9252,12 +9307,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -9288,8 +9343,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>SP change</translation> </message> @@ -9551,17 +9606,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9570,84 +9625,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Safety stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9656,7 +9711,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9665,175 +9720,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Density: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Safety stop: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tissue %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD in leading tissue </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>heart rate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>mean depth to here %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9882,142 +9937,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>more than %1 days</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n dive(s))</numerusform><numerusform>(%n dive(s))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXYGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Number</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Dives</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Trips</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistics</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Advanced search</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibility</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Suit</translation> </message> @@ -10028,180 +10083,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Show more details</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Year</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Total time</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Average time</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Shortest time</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Longest time</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Average depth</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. depth</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max. depth</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Average SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Average temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Back to list</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Dive No.</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Dive profile</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Dive information</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Dive equipment</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Size</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Work pressure</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Start pressure</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>End pressure</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Events</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Value</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordinates</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Dive status</translation> </message> @@ -10231,62 +10286,62 @@ EADD: %d%s / %.1fg/ℓ <translation>All (by trip stats)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10537,12 +10592,17 @@ Is the Uemis Zurich plugged in correctly?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>Cannot find a folder called 'theme' in the standard locations</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. depth:</translation> @@ -10568,77 +10628,77 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Notes:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Sank</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Submerge time</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Reason</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationality</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Length</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Draught</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Displacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Wreck Data</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Depth</translation> </message> @@ -10683,27 +10743,27 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>City</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Start saving data</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Start saving dives</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Done creating local cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Preparing to save data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>mode change</translation> </message> @@ -10718,7 +10778,7 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Remove this point</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Don't save an empty log to the cloud</translation> </message> @@ -10738,22 +10798,22 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Invalid response from server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Expected XML tag 'DiveDates' not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> @@ -10766,112 +10826,102 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Dive management</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Disable auto cloud sync</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Enable auto cloud sync</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Disable location service</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Settings</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Add dive manually</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Download from DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Manual sync with cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Upload GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Apply GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Download GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Show GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Clear GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App log</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Theme information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>About</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Run location service</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 6a427b59e..98fcca526 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -167,160 +167,160 @@ <translation>Buscando dispositivos remotos…</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>La búsqueda finalizó correctamente.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>El dispositivo Bluetooth local está %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>activado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>desactivado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>NO EMPAREJADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>EMPAREJADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORIZADO_EMPAREJADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Estado: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>El dispositivo %1 puede usarse para conectar. Puede pulsar el botón Guardar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>El dispositivo %1 debe ser emparejado para poder utilizarse. Por favor, utiliza el menú contextual para opciones de emparejado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>El dispositivo necesita una dirección no nula para conectar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Se ha cambiado el dispositivo local.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Emparejar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Borrar emparejamiento</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Intentando emparejar el dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Intentando desemparejar el dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>El dispositivo %1 ha sido desemparejado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>El dispositivo %1 ha sido emparejado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>El dispositivo %1 se emparejó y autorizó</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>El dispositivo %1 puede usarse para conexión. Puedes pulsar el botón Guardar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Error del dispositivo local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Error de emparejamiento. Si el dispositivo remoto requiere un PIN, por favor, intenta emparejar los dispositivos usando el sistema operativo.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Error desconocido</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>El adaptador Bluetooth está apagado, enciendelo antes de activar la busqueda.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Escribir o leer del dispositivo ha resultado en un error.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Ha ocurrido un error desconocido.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Error en la busqueda de dispositivos: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>No disponible</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>No se puede acceder al adaptador de Bluetooth local.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>No se creó el agente de busqueda de dispositivos porque la dirección %1 no coincide con la dirección del adaptador físico de ningún dispositivo Bluetooth.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Persona:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Busca por compañeros y divemasters</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Sin compañeros</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Hacer copia de seguridad de los ajustes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Copia de seguirdad</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Error en la copia de seguridad XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Se produjo un error al guardar la copia de seguridad. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Copia de seguridad correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Se han guardado los ajustes en: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Recuperar ajustes del ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Error al recuperar el XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocurrió un error al recuperar la copia de seguridad. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Recuperación correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Los ajustes se han recuperado correctamente.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Seleccionar archivo de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Archivos de registro</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Conectando con el dispositivo ...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Conectado al dispositivo ...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Desconectado del dispositivo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar archivo de registro para descarga desde ordenador de buceo</translation> </message> @@ -1974,22 +1974,22 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Detalles de inmersión</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Eliminar inmersión</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Cancelar edición</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Mostrar en el mapa</translation> </message> @@ -1997,104 +1997,136 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Inmersión %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Fecha:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Ubicación:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordenadas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Utilizar posición GPS actual:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Profundidad:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Duración:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temp. del aire:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temp. del agua:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Botella:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Botella1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Mezcla de gas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Presión inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Presión final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Botella2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Botella3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Botella4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Botella5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Calificación:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notas:</translation> </message> @@ -2263,104 +2295,119 @@ GPS actual:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Contraer todo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Contraer otras</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Borrar inmersión(es) del viaje</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Crear nuevo viaje por encima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Añadir inmersión(es) al viaje de arriba</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Añadir inmersión(es) al viaje de debajo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Combinar viaje con el viaje de encima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Combinar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marcar inmersión(es) como no válida(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renumerar inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Desplazar hora de la inmersión</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Divide las inmersiones seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Cargar imagen(es) de archivo(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Cargar imagen de la web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Archivos de imagen (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Abrir archivos de medios</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 no parece ser una imagen</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Archivos de medios</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Archivos de imagen</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Abrir archivos de imagen</translation> + <source>Video files</source> + <translation>Archivos de video</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Todos los archivos</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 no parece ser una imagen</translation> </message> </context> <context> @@ -2561,7 +2608,7 @@ GPS actual:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Iluminación</translation> </message> @@ -2571,121 +2618,121 @@ GPS actual:</translation> <translation>Arena</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Formato genérico que se utiliza para intercambio de datos entre programas relacionados con el buceo.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valores separados por comas que describen el perfil de buceo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valores separados por comas de la información del buceo. Aquí se incluyen la mayoría de los detalles pero no la información del perfil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Enviar los datos de buceo al sitio web divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Enviar datos de buceo a la web dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exporta las ubicaciones de buceo en HTML, visualizándolas en un mapa mundial.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Formato XML nativo de Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Escribir la profundidad de las imágenes a archivo.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Guardar la inmersión como macros de TeX.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exportar archivo UDDF como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>archivo UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>archivo CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>archivo HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>archivo TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exportar archivo CSV como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exportar mapamundi</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportar a XML de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Guardar profundidades de las imágenes</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exportar a archivo TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exportar archivos HTML como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Espere mientras se exporta…</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>No se puede abrir el archivo %s</translation> </message> @@ -3045,62 +3092,62 @@ GPS actual:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>bot.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Profundidad final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Tiempo acumulado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Modo de buceo</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Tiempos de parada</translation> </message> @@ -3305,261 +3352,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Prof.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Botella</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>CNS máximo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotos</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Medios</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Pais</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Compañero</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotos antes/durante/después de la inmersión </translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Medios antes/durante/después de la inmersión</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>No se seleccionó ninguna inmersión</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>No se ha encontrado la hoja de estilo para exportar a divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>Fallo al crear archivo .zip para subir: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>Error interno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Ha fallado la conversión de la inmersión %1 al formato de divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>error al escribir el archivo zip: %s error de zip %d error de sistema %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Hecho</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Subiendo lista de inmersiones…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Descargando lista de inmersiones…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Descargando %1 inmersiones…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Descarga finalizada - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problema con la descarga</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>No se ha podido abrir el archivo: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Descarga corrompida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>El archivo no pudo abrirse %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Subida finalizada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>La subida ha fallado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Subida correcta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>El acceso ha fallado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>No se puede leer la respuesta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3567,23 +3620,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Descargar</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Elegir modo de descarga Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Conectado con el ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Error</translation> </message> @@ -3593,42 +3646,47 @@ p, li { white-space: pre-wrap; } <translation>Encontrar ordenador de buceo Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Encontrar ordenador de buceo Garmin</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Cancelar descarga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar archivo de registro para descarga desde ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Archivos de registro</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Selecciona archivo para el volcado binario desde el ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Archivos de volcado</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Reintentar descarga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones.</translation> </message> @@ -3700,9 +3758,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Descargar</translation> </message> @@ -3728,7 +3786,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3743,57 +3801,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth no está habilitado</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Nombre del fabricante:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>Dispositivo USB</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Ordenador de buceo:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Conexión:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Intentar de nuevo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Volver a escanear</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Descargar inmersiones</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Des-seleccionar todo</translation> </message> @@ -3824,12 +3888,12 @@ p, li { white-space: pre-wrap; } <translation>Conectar al marcador de texto de Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Para desconectar Subsurface de tu cuenta de Facebook, utiliza la opción 'Compartir' del menú.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Para conectar con Facebook, por favor inicie sesión. Esto permitirá a Subsurface publicar inmersiones en su historial.</translation> </message> @@ -3837,22 +3901,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Regsitrado correctamente en Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, id de usuario desconocida, no se pudo conectar</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Inmersión subida a Facebook con exito</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Ha fallado el envío de la inmersión. Por favor, comprueba la salida de depuración y remítela a la lista de correo de Subsurface.</translation> </message> @@ -3868,17 +3932,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Des-seleccionar todo</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Invertir la selección</translation> </message> @@ -3933,18 +3997,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Encontrar imágenes movidas</translation> + <source>Find moved media files</source> + <translation>Encontrar archivos de medios movidos</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Imágenes encontradas</translation> + <source>Found media files</source> + <translation>Encontrar archivos de medios</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Buscar imágenes solo en la(s) inmersión(es) seleccionada(s)</translation> + <source>Match only media files in selected dive(s)</source> + <translation>Coincidir solo con archivos de medios en la(s) inmersión(es) seleccionada(s)</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3959,8 +4023,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Buscar en directorios de imágenes</translation> + <source>Traverse media directories</source> + <translation>Recorrer carpetas de medios</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3974,18 +4038,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>No se han encontrado imágenes que coincidan</translation> + <source>No matching media files found</source> + <translation>No se encontraron archivos de medios que coincidan</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>Encontradas <b>%1</b> imágenes en su ubicación actual.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation>Encontrados <b>%1</b> archivos de medios en su ubicación actual.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>Encontradas <b>%1</b> imágenes en nuevas ubicaciones:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation>Encontrados <b>%1</b> archivos de medios en nuevas ubicaciones:</translation> </message> </context> <context> @@ -4077,40 +4141,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Ubicación: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Ubicación</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(igual posición GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 de distancia</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n inmersión aquí)</numerusform><numerusform>, %n inmersiónes aquí)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(no existen datos GPS, añadir posición GPS de esta inmersión)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(sin datos GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Elegir punto:</translation> </message> @@ -4118,7 +4182,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Sin localización</translation> </message> @@ -4243,8 +4307,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -4265,19 +4329,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temperatura del aire</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temperatura del agua</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -4358,8 +4422,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotos</translation> + <source>Media</source> + <translation>Medios</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4392,53 +4456,53 @@ p, li { white-space: pre-wrap; } <translation>Añadir sistema de lastre</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temp. aire [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temp. agua [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Este viaje está siendo editado.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Se están editando varias inmersiones.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Esta inmersión esta siendo editada.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Notas del viaje</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Ubicación del viaje</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nuevo punto de buceo</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>¿ Descartar los cambios ?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Estás a punto de descartar tus cambios.</translation> </message> @@ -4471,424 +4535,419 @@ p, li { white-space: pre-wrap; } <translation>&Importar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Compartir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Nuevo registro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nuevo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Abrir registr&o</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Im&primir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&referencias</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importar del or&denador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importar datos &GPS del servicio web de Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Editar &nombres de dispositivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Añadir inmersión</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Editar inmersión</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copiar componentes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Pegar componentes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Auto a&grupar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Lista &de Inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Información</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Todo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Ante&rior ordenador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Siguie&nte ordenador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Acerca de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manual de usuario</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Mapa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanificar inmersión</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importar archivos de registro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importar archivos de registro de otras aplicaciones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importar desde Divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Pantalla completa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Activar pantalla completa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Comprobar si hay actualizaciones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exportar diarios de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configurar or&denador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Editar inmersión en el planificador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Activar gráfico de pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Activar gráfico de pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Activar el gráfico de pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Activar techo informado por el ordenador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Activar techo calculado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Activar cálculo de todos los tejidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Activar techo calculado con incrementos de 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Activar ritmo cardiaco</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Activar PMO</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Activar PEA, PNE y EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Activar LND, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Activar tasa de CAS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Activar regla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Activar fotografías</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Activar medios</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>&Encontrar archivos de medios movidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Activar barra de gases</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrar la lista de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Activar heat-map de tejidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Encuesta de u&suario</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Deshacer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Rehacer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Encontrar imágenes movidas</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Abrir a&lmacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Guardar en almacenamiento en la n&ube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Gestionar puntos de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Editar punto de buceo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Conectar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Desconectar de </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Intentando fusionar inmersiones con %1min de intervalo entre ellas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Creada plantilla de respaldo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,214 +4969,214 @@ Ubicación: Desde esta versión de Subsurface, las plantillas predefinidas serán de solo lectura y no deben editarse directamente, ya que la aplicación puede sobre escribirlas al iniciarse.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de ir en línea</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Hay cambios sin guardar. Quiere guardar en la nube? Si selecciona no, la nube solo sera sincronizada en la próxima llamada de "abrir el almacenamiento" o "guardar el almacenamiento".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Error en activar almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo acumulado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termina la edición actual antes de intentar hacer otra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Archivos de registro de inmersiones </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>archivos MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtool</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Se perderán los cambios si no los guarda.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[caché local de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[almacenamiento en la nube de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Abriendo archivo de datos de una versión anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Has abierto un archivo de datos de una versión anterior de Subsurface. Te recomendaamos leer el manual para informarte acerca de los cambios de la nueva versión, especialmente sobre la gestión de puntos de buceo que ha variado significativamente. Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perder un momento en echar una mirada al nuevo sistema de gestión de puntos de buceo para asegurarte de que todo este correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Contactando con el servicio en la nube ...</translation> </message> @@ -5174,7 +5233,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Los filtros muestran %1 (de %2) inmersiones</translation> </message> @@ -5182,12 +5241,12 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Se debería actualizar el firmware del ordenador de buceo: La versión actual es %1 pero la última versión estable es %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5196,27 +5255,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para descargar divelogs antes de seguir con la actualización</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Ahora no</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Actualizar firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Aviso de actualización del firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Guardar el firmware descargado como </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Archivos de firmware</translation> </message> @@ -5354,8 +5413,8 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Sin archivo por defecto</translation> + <source>&No default file</source> + <translation>&Sin archivo por defecto</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5379,6 +5438,7 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>…</translation> </message> @@ -5409,29 +5469,54 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Miniaturas de video</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>ejecutable ffmpeg</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Extraer en la posición</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Extraer miniaturas de video</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Borrar todos los ajustes</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Reiniciar todos los ajustes a sus valores por defecto</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Abrir archivo de registro por defecto</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Seleccionar el ejecutable ffmpeg</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5586,8 +5671,8 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Recalcula las miniaturas si son más antiguas que la imagen </translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Recalcular miniaturas si son más antiguas que el archivo de medios</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5626,7 +5711,7 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <translation>Mostrar profundidad media en el perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -5705,27 +5790,27 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <translation>Para cargar correctamente un nuevo lenguaje debes reiniciar Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Se usarán como están. Puede ser que esto no sea lo que deseabas. Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caracteres literales</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Carácter(es) no-especial(es) en el formato de hora. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Carácter(es) no-especial(es) en el formato de fecha. @@ -5777,7 +5862,7 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Almacenamiento en la nube de Subsurface</translation> </message> @@ -5802,73 +5887,58 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>¿Guardar contraseña localmente?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Servicio web de Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID de usuario por defecto</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>¿Guardar localmente la ID de usuario?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Sin proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Proxy del sistema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, '.', '-', '_', y '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, '.', '-', '_', y '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, '.', '-', '_', y '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Almacenamiento en la nube de Subsurface (credenciales verificadas)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Almacenamiento en la nube de Subsurface (password incorrecta)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Almacenamiento en la nube de Subsurface (Se necesita el PIN)</translation> </message> @@ -6197,133 +6267,133 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Ordenador de buceo desconocido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Añadir cambio de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Convertir en ordenador de buceo principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Inmersión planeada</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Inmersión añadida a mano</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Borrar este ordenador de buceo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(bot. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Añadir cambio de "set-point"</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Añadir marca</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Dividir la inmersión en dos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Cambiar el modo de buceo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Editar el perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Borrar evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Ocultar eventos similares</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Editar nombre</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusta la presión de Bot. %1 (actualmente interpolada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Revelar todos los eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>¿ Ocultar todos los eventos %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>¿ Borrar el evento seleccionado ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Editar el nombre de la marca</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Nombre personalizado:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>¡El nombre es demasiado largo!</translation> </message> @@ -6331,53 +6401,53 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Abrir archivo de datos local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Abrir archivo de datos local ha fallado</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 inmersiones cargados desde archivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>Funcionando en modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Error analizando el almacenamiento local. Abortando.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>sin credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Por favor, introduce credenciales para la nube validas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, '.', '-', '_', y '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Formato de correo electrónico inválido</translation> </message> @@ -6427,50 +6497,50 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <translation>No se pudo conectar con el almacenamiento en la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciales en la nube validadas, cargando inmersiones ...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Error en almacenamiento en la nube: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Cargando inmersiones desde el almacenamiento local (sin nube)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fallo al conectar con el servidor en la nube, volviendo al modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Almacenamiento en la nube abierto. No hay inmersiones en la lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Posición GPS desconocida</translation> </message> @@ -6478,7 +6548,7 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> @@ -6570,116 +6640,126 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Ajustes</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Sin definir</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Combinación usuario/password incorrecta</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Las credenciales necesitan ser verificadas</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Credenciales verificadas</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Sin conexión a la nube</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Estado de conexión a la nube</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>No aplicable</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Cambiar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Azul</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>Texto normal</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Resaltado</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Oscuro</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Servicio web de datos GPS de Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Distancia límite (metros)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Tiempo límite (minutos)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Botella por defecto</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Botella:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Desarrollador</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Mostrar el menú de desarrolladores</translation> </message> @@ -6714,17 +6794,17 @@ Por favor, exporta esta plantilla a un archivo distinto.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>¡Aviso! -No todas las imágenes tienen marcas de tiempo en la franja entre -30 minutos antes del comienzo y 30 minutos despues del final de -cualquiera de las inmersiones seleccionadas.</translation> +No todos los archivos de medios tienen la hora en el rango de 30 +minutos antes del comienzo y 30 minutos después del fin de cualquiera de +las inmersiones seleccionadas.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Cargar imágenes aunque la hora no coincida con la hora de inmersión</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Cargar los archivos de medios aunque la hora no se corresponda con la hora del buceo</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6747,39 +6827,39 @@ cualquiera de las inmersiones seleccionadas.</translation> <translation>¿ Que fecha y hora se muestran en la imagen ?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Abrir archivo de imagen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Archivos de imagen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Fecha/hora de la inmersión seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Fecha/hora de la primera inmersión seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Fecha/hora de la última inmersión seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Archivos con fecha/hora incorrectas</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>No se ha encontrado fecha/hora Exif</translation> </message> @@ -6872,28 +6952,28 @@ Archivos con fecha/hora incorrectas</translation> <translation>Mensajes de la importación (errores, avisos, etc)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Abrir archivos de SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>Archivos de SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Abrir archivos de Subsurface</translation> </message> @@ -6901,64 +6981,64 @@ Archivos con fecha/hora incorrectas</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pequeño</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Fecha de la inmersión: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duración: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Lugar de la inmersión: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Compañero: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7095,65 +7175,17 @@ Archivos con fecha/hora incorrectas</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Introducir ID de usuario y pulsar Descargar</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Servicio web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Conectando…</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Descarga finalizada</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Error de descarga: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Error de conexión:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>El identificador de usuario no es válido.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>No se puede analizar la respuesta.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Descarga completa</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Trajes:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Sin traje definido</translation> </message> @@ -7284,39 +7316,44 @@ Archivos con fecha/hora incorrectas</translation> <translation>Nivel de zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Cargar imagen(es) de archivo(s)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Cargar imagen(es) desde la web</translation> + <source>Load media from file(s)</source> + <translation>Cargar medios desde archivo(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Borrar imágenes seleccionadas</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Cargar archivo(s) de medios desde la red</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Borrar todas las imágenes</translation> + <source>Delete selected media files</source> + <translation>Borrar los archivos de medios seleccionados</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Borrar todos los archivos de medios</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Abrir la carpeta de los archivos de medios seleccionados</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Recalcular las miniaturas seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Borrando imágenes</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>Borrando archivos de medios</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>¿ Estás seguro de querer borrar todas las imágenes ?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>¿Estás seguro de querer borrar todos los archivos de medios?</translation> </message> </context> <context> @@ -7484,15 +7521,15 @@ a partir de aire y usando: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Etiquetas:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Etiquetas</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Etiquetas vacío</translation> </message> @@ -7691,7 +7728,7 @@ a partir de aire y usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1clica para visitar %2</translation> </message> @@ -7715,130 +7752,135 @@ a partir de aire y usando: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 mostrada)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Botella</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Medios antes/durante/después de la inmersión</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Compañero</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotos antes/durante/después de la inmersión</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Pais</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -7852,81 +7894,81 @@ a partir de aire y usando: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Introducir URL para imágenes</translation> + <source>Enter URL for media files</source> + <translation>Introducir URL de los archivos de medios</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Buscar actualizaciones</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface no pudo buscar actualizaciones.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Ocurrió el siguiente error:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Por favor, comprueba la conexión a internet.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Está usando la última versión de Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Está disponible una nueva versión de Subsurface.<br/>Pulse en:<br/><a href="%1">%1</a><br/> para descargarla.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Está disponible una nueva versión de Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>La última versión es %1, por favor comprueba %2 nuestra página de descargas %3 para informarte sobre como actualizar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>La versión más reciente es</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>El servidor devolvió la siguiente información:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface comprueba cada dos semanas si hay una nueva versión disponible. Si no quieres que Subsurface siga haciendolo, por favor pulsa Declinar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Declinar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Comprobación automática de actualizaciones</translation> </message> @@ -8102,6 +8144,19 @@ Idioma: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>ffmpeg falló al iniciarse - creación de miniaturas de vídeo suspendida</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>fallo al esperar a ffmpeg - creación de miniaturas de vídeo suspendida</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8157,12 +8212,12 @@ Idioma: %1</translation> <translation>Subir</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Tiempo de espera sobrepasado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Transfiriendo datos ...</translation> </message> @@ -8188,8 +8243,8 @@ Idioma: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Sin errores</translation> </message> @@ -8313,7 +8368,7 @@ Media</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Error al analizar la cabecera</translation> </message> @@ -8650,9 +8705,9 @@ Media</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxígeno</translation> </message> @@ -8667,131 +8722,131 @@ Media</translation> <translation>Circuito abierto</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>pie³</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>aire</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>cinturón</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>tobillo</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>placa</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8868,123 +8923,123 @@ Media</translation> <translation>No se ha encontrado perfil de '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Desconexión del almacenamiento(%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transferencia del almacenamiento (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transferencia al almacenamiento (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Carpeta de cache local %s corrupta - No se puede sincronizar con el almacenamiento en la nube de Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>No se pudo actualizar la caché local con nuevos datos remotos</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Almacenamiento en la nube de Subsurface corrupto</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>No se pudo actualizar el almacenamiento en la nube de Subsurface, intentalo de nuevo más tarde.</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>El almacenamiento remoto y los datos locales son diferentes. Error: falló el merge (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>El almacenamiento remoto y los datos locales son diferentes. No se pueden combinar los cambios en ambos.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>El almacenamiento remoto y los datos locales han divergido</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>El almacenamiento remoto y los datos locales son diferentes. Error: fallo al escribir los datos (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemas con el caché local de los datos en la nube de Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Datos en caché movidos a %s. Por favor, reintenta la operación.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Actualizando el almacenamiento local para adecuarlo a la nube</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Enviando los cambios locales a la nube</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Intentando insertar los cambios locales en la nube</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Guardando los datos en la nube</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sincronizando con la nube</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>No se puede alcanzar el servidor en la nube, trabajando con copia local</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Conexión con la nube establecida, descargando datos remotos</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Sincronización con la nube terminada</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Error al conectar al almacenamiento en la nube de Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Falló "git clone" de %s (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Sincronizando archivo de datos</translation> </message> @@ -9083,119 +9138,119 @@ Media</translation> <translation>el número de evento no es válido</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Error al analizar la fecha</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Inmersión n.º %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Error al analizar el tiempo de buceo</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Error al analizar la máxima profundidad</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Error al leer la temperatura</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Error al analizar el conteo de mezcla de gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Error al obtener salinidad del agua</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Error al obtener la presión en superficie</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Error al obtener el modo de buceo</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Error al analizar la mezcla de gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>No es posible crear el analizador para %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Error al registrar los datos</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Inmersión ya descargada en %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>modelo=%s firmware=%u serie=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Error al abrir el dispositivo %s %s (%s). En la mayoría de los casos, para depurar este problema, sería útil enviar a los desarrolladores los archivos de registro. Puedes copiarlos al portapapeles en el diálogo "Acerca de ..."</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9204,13 +9259,13 @@ En la mayoría de los casos, para depurar este problema, sería útil un archivo Puedes crear el archivo de registro seleccionando la casilla correspondiente en el diálogo de descargas.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>No hay nuevas inmersiones descargadas del ordenador de buceo</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiples posiciones GPS para este punto de buceo; también %s @@ -9218,19 +9273,19 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>otro nombre para este sitio: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Carga de inmersiones de la caché local</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Abiertos datos de inmersiones</translation> </message> @@ -9253,12 +9308,12 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>No se pudo analizar '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> @@ -9289,8 +9344,8 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>, GF efectivo = %d%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Cambio de SP</translation> </message> @@ -9552,17 +9607,17 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>valor de pO₂ bajo %.2f en %d:%02u con gas %s a profundidad %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>No puedo encontrar el gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9571,84 +9626,84 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9657,7 +9712,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9666,174 +9721,174 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densidad: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Parada de seguridad: duración desconocida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Parada deco: duración desconocida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>En deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>LND: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tejido %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD en el tejido principal</translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>ritmo cardiaco: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Prof. media hasta aquí %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s CAS:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9882,142 +9937,142 @@ EADD: %d%s / %.1fg/ℓ <translation>O</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AIRE</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>más de %1 días</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n inmersión(es))</numerusform><numerusform>(%n inmersión(es))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXÍGENO</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>No se puede abrir el archivo %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temperatura del aire</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temperatura del agua</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Inmersiones</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Contraer todo</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Viajes</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Estadísticas</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Búsqueda avanzada</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibilidad</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Compañero</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Traje</translation> </message> @@ -10028,180 +10083,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mostrar más detalles</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Año</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Tiempo total</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Duración media</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Duración mas corta</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Duración más larga</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Prof media</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Prof. mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Prof. máxima</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>CAS medio</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>CAS mínimo</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>CAS máximo</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temp. promedio</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temp. mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temp. máxima</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Volver a la lista</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Inmersión n.º</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Perfil de la inmersión</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Información de la inmersión</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Equipo de buceo</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Presión de trabajo</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Presión inicial</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Presión final</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Sucesos</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nombre</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valor</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordenadas</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Estado de la inmersión</translation> </message> @@ -10231,62 +10286,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Todo (por estadísticas de viaje)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Ene</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mayo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dic</translation> </message> @@ -10537,12 +10592,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>seg</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>No se encuentra una carpeta llamada 'theme' en las localizaciones estándar</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Prof. máxima;</translation> @@ -10568,77 +10628,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Notas:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Construido</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Hundido</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Hora del hundimiento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Razón</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nacionalidad</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Astillero</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Tipo de embarcación</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Eslora</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Manga</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Calado</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Desplazamiento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Carga</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Datos del pecio</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitud</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Prof.</translation> </message> @@ -10683,27 +10743,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ciudad</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Comienza el guardado de datos</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Comienza el guardado de inmersiones</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Crear caché local terminado</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Preparando el guardado de datos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>Cambio de modo</translation> </message> @@ -10718,7 +10778,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Borrar este punto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>No guardar un divelog vacío en la nube</translation> </message> @@ -10738,22 +10798,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Máxima</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Respuesta del servidor inválida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Esperada etiqueta XML 'DiveDateReader', se recibió '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>No encontrada etiqueta XML esperada 'DiveDates'</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Respuesta XML mal formada. Línea %1:%2</translation> </message> @@ -10766,112 +10826,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Lista de inmersiones</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Gestión de inmersiones</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Desactivar auto sincronización con la nube</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Activar sincronizado automático con la nube</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Deshabilitar servicio de posicionamiento</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Ajustes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Añadir inmersión manualmente</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Descargar desde el ordenador</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Sincronización manual con la nube</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Desactivar la sincronización automática con la nube hace que todos los datos se guarden localmente. Esto puede ser muy útil en situaciones con acceso limitado a la red. Por favor, selecciona 'Sincronización manual con la nube' si dispones de conexión y quieres sincronizar tus datos con el almacenamiento en la nube.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Subir datos GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Aplicar posiciones GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Descargar datos GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Mostrar posiciones GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Borrar la cache de GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Desarrollador</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Registro de la app</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Información de tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Acerca de</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Activar servicio de posicionamiento</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 220567ae0..96aec0fb3 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -164,160 +164,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>sisselülitatud</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>väljalülitatud</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>MITTEPAARITATUD</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAARITATUD</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORISEERITUD_PAARITATUD</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Olek: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Kohalik seade on vahetatud</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Paarita</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Eemalda paaritus</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Üritan paarituda seadmega %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Üritan paaritada lahti seadmest %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Seade %1 on lahti paaritatud.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Seade %1 on paaritatud.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Seade %1 on paaritatud ja autoriseeritud.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Kohaliku seadme viga: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Tundmatu viga</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Pole kättesaadav</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -325,12 +325,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Isik:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Otsi semusid ja divemastereid</translation> </message> @@ -338,7 +338,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Pole semu</translation> </message> @@ -1659,102 +1659,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Varunda sukeldumiskompuutri seaded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML varundamise viga</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Viga varukoopia faili kirjutamisel. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Varundamine õnnestus</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Seaded on salvestatud: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Taasta sukeldumiskompuutri seaded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML taastamise viga</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Viga varukoopia taastamisel. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Taastamine õnnestus</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Seaded on edukalt taastatud.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Vali firmware fail</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1970,22 +1970,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Sukeldumise info</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Kustuta sukeldumine</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Näita kaardil</translation> </message> @@ -1993,104 +1993,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Sukeldumise #%1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Kuupäev:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Asukoht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinaadid:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Kasuta praegust asukohta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Sügavus:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Kestus:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Õhu temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Vee temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Raskus</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Balloon:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gaasisegu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Algrõhk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Lõpurõhk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Hinne:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> @@ -2259,104 +2291,119 @@ asukohta:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Laienda kõik</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Ahenda kõik kokku</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Ahenda teised</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Loo uus väljasõit üles</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Ühenda väljasõit väljasõiduga ülal</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Kustuta sukeldumine/sukeldumised</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Ühenda valitud sukeldumised</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Nummerda sukeldumine/sukeldumised ümber</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Nihuta sukeldumise ajad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Lae pilt (pildid) faili(de)st</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Lae pilt veebist</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 ei paista olevat pilt</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Ava pildifailid</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 ei paista olevat pilt</translation> </message> </context> <context> @@ -2557,7 +2604,7 @@ asukohta:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Valgus</translation> </message> @@ -2567,121 +2614,121 @@ asukohta:</translation> <translation>Liiv</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Geneeriline formaat, mida kasutatakse andmevahetuseks erinevate sukeldumisega seotud tarkvarade vahel.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Sukeldumisprofiili andmed CSV formaadis</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Sukeldumise info CSV formaadis. Sisaldab põhiosa sukeldumise infost v.a profiil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Saada sukeldumiste info divelogs.de kodulehele</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Saada sukeldumiste andmed dive-share.appspot.com veebilehele</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Maailmakaardil visualiseeritavate sukeldumiskohtade eksport HTML-formaadis</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface oma XML vorming</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Kirjuta piltide sügavused faili.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Kirjuta sukeldumine TeX makro kujul faili</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Ekspordi UDDF fail kui</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Ekspordi CSV fail kui</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Ekspordi maailmakaart</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Ekspordi Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Salvesta piltide sügavused</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Eksport TeX faili</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Ekspordi HTML fail kui</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Palun oota, ekspordin...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Ei saa avada faili %s</translation> </message> @@ -3041,62 +3088,62 @@ asukohta:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Lõppsügavus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Töö aeg</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Sukeldumise liik</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3306,261 +3353,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Balloon</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gaas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>Hapnikumürgistuse ühik (OTU)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Märgendid</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotod</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Riik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Semu</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Sügavus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Raskus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotod sukeldumise eel/ajal/järel</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>Ühtegi sukeldumist pole valitud</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>zip-faili loomine üleslaadimiseks ebaõnnestus: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>sisemine viga</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Sukeldumise %1 teisendamine divelogs.de formaati ebaõnnestus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Valmis</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Sukeldumiste listi üleslaadimine...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Sukeldumiste listi allalaadimine...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Laen alla %1 sukeldumist...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Allalaadimine lõppenud - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Probleem allalaadimisel</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Arhiivi ei ole võimalik avada: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Vigane allalaadimine</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Arhiivi ei saa avada: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Üleslaadimine lõppenud</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Üleslaadimine ebaõnnestus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Üleslaadimine edukas</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Sisselogimine ebaõnnestus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Ei suuda vastust tuvastada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Viga: %1</translation> </message> @@ -3568,23 +3621,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Allalaadimine</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Vali Bluetoothi allalaadimise viis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Viga</translation> </message> @@ -3594,42 +3647,47 @@ p, li { white-space: pre-wrap; } <translation>Leia Uemis sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</translation> </message> @@ -3701,9 +3759,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Allalaadimine</translation> </message> @@ -3729,7 +3787,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Loobu</translation> </message> @@ -3744,57 +3802,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Tarnija nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Sukeldumiskompuuter:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Korda</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Välju</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Allalaetud sukeldumised</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Kinnita</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Vali kõik</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Tühista kõik</translation> </message> @@ -3825,12 +3889,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Facebookiga ühenduse loomiseks logi sinna sise. See võimaldab Suibsurface'l avaldada sukeldumisi sinu ajajoonel</translation> </message> @@ -3838,22 +3902,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3869,17 +3933,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Vali kõik</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Tühista kõik</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3934,17 +3998,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3960,7 +4024,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3975,17 +4039,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4078,40 +4142,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Asukoht:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Asukoht</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(sama GPS lugem)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(pole GPS andmeid)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Nopi sukeldumiskoht:</translation> </message> @@ -4119,7 +4183,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4244,8 +4308,8 @@ Oled kindel et soovid jätkata?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Märkmed</translation> </message> @@ -4266,19 +4330,19 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Õhu temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Vee temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -4359,8 +4423,8 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotod</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4393,53 +4457,53 @@ Oled kindel et soovid jätkata?</translation> <translation>Lisa raskuste süsteem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Õhu temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Vee temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Seda väljasõitu toimetatakse</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Mitut sukeldumist toimetatakse</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Seda sukeldumist toimetatakse.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Väljasõidu märkmed</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Väljasõidu koht</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Uus sukeldumiskoht</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Loobu muudatustest?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Oled muudatustest loobumas.</translation> </message> @@ -4472,424 +4536,419 @@ Oled kindel et soovid jätkata?</translation> <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Toimeta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Uus logiraamat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Uus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Ava logiraamat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Ava</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Salvesta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Salvesta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Sa&lvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Sulge</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Sulge</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Väljastus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Eelistused</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Välju</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Impordi &sukeldumiskompuutrist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Impordi &GPS andmed Subsurface veebiteenusest</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Toimeta seadme &nimed</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Lisa sukeldumine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Toimeta sukeldumist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Kopeeri sukeldumise komponendid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&kleebi sukeldumise komponendid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Nummerda ümber</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Automaatne grupeerimine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Aastane statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Sukeldumiste nimekiri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profiil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Kõik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>&Eelmine sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Järgmine sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Subsurface kohta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Kasutaja &juhend</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&laneeri sukeldumine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Impordi logifailid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Impordi sukeldumislogi failid teistest rakendustest</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Import divelogs.de-st</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Täisekraan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Kuva täisekraan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Kontrolli uuendusi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Ekspordi sukeldumiste logid</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Seadista &dive kompuuter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Toimeta &sukeldumine planeerijas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>pO₂ graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>pN₂ graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>pHe graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Sukeldumiskompuutri poolt antud lagi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Arvutatud lagi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Kõik koed</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Arvutatud lagi 3m intervalliga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Südame pulss</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC määr</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Joonlaud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Skaleeri graaf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Pildid</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Kasutajaküsitlus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Salvesta pilve</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Sukeldumiskoha toimetamine</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Ühenda</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Ühenda lahti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Ava fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4903,212 +4962,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Aastane statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5164,7 +5223,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5172,39 +5231,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Sukeldumiskompuutri firmware vajaks uuendamist: praegune on versioon %1, viimane stabiilne versioon on aga %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Mitte praegu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Uuenda firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmware uuendamise teade</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Salvesta allalaetud firmware nimega</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5342,8 +5401,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Pole vaikimisi faili</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5367,6 +5426,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5397,29 +5457,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Kustuta kõik seaded</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Vii kõik seaded väikeväärtustele</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Ava vaikimisi logifail</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5574,7 +5659,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5614,7 +5699,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Näita keskmist sügavust profiilis</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profiil</translation> </message> @@ -5693,25 +5778,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Tähemärgid</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5762,7 +5847,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface pilve salvesti</translation> </message> @@ -5787,73 +5872,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Salvesta salasõna lokaalselt?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface veebiteenus</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Vaikimisi kasutaja ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Salvesta kasutaja ID lokaalselt?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Võrk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Pole proxyt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Süsteemi proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6181,133 +6251,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation>(#%1 %2st)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Tundmatu sukeldumiskompuuter</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Lisa gaasivahetus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(balloon %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Lisa järjehoidja</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Toimeta profiili</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Eemalda sündmus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Peida sarnased sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Toimeta nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Peida kõik sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Peida sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Peida kõik %1 sündmust?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Eemalda valitud sündmus?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Toimeta järjehoidja nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Kohandatud nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Nimi on liiga pikk!</translation> </message> @@ -6315,53 +6385,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Alustan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>Töötamine mitte-pilve režiimis</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>pole pilve volitusi</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Palun sisesta kehtivad pilve volitused.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6411,50 +6481,50 @@ Please export this template to a different file.</source> <translation>Ei saa ühendust pilve salvestiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Pilve salvesti viga: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Pilve salvesti avamine õnnestus. Sukeldumiste nimekiri on tühi.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Tundmatu GPS koht</translation> </message> @@ -6462,7 +6532,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Alustan...</translation> </message> @@ -6554,116 +6624,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Seaded</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-post</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Olek</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Teema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Sinine</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS andmete veebiteenus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Vahemaa lävi (m)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Aja lävi (minutid)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Vaikimisi balloon</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Balloon:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Arendaja</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6698,13 +6778,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6728,38 +6808,38 @@ Not all images have timestamps in the range between <translation>Mis kuupäev ja kellaaeg on pildil?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Ava pildifail</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6852,28 +6932,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Ava SmartTrak failid</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6881,64 +6961,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Keskmine</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Sukeldumise kuupäev: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Kestus: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sukeldumise asukoht: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Semu: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7075,65 +7155,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Sisesta kasutaja ID ja kliki Allalaadimisel</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Veebiteenus</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Ühendab...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Allalaadimine lõppenud</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Allalaadimise viga: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Ühenduse viga:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Vale kasutaja ID!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Ei suuda vastust tuvastada</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Allalaadimine õnnestus</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Ülikond:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7264,39 +7296,44 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Lae pilt (pildid) faili(de)st</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Lae pilt (pildid) veebist</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Kustuta valitud pildid</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Kustuta kõik pildid</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Kustutan pildid</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Oled kindel et soovid kustutada kõik pildid?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7463,15 +7500,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Märgendid:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Märgendid</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Tühjad märgendid</translation> </message> @@ -7670,7 +7707,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7694,130 +7731,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Sügavus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Balloon</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Märgendid</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Semu</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Raskus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gaas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotod sukeldumise eel/ajal/järel</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Riik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -7831,80 +7873,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Kontrolli kas on uuendusi</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface ei saanud uurida uuenduste kohta.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Tekkis järgmine viga:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Palun kontrolli oma netiühendust.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Kasutad kõige uuemat Subsurface versiooni.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Uuem Subsurface on väljas.<br/>Klikka allalaadimiseks:<br/><a href="%1">%1</a><br/></translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Subsurface uuem versioon on väljas.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Viimane versioon on %1, vaata %2 allalaadimise lehte %3 kuidas uuendada.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Uusim versioon on</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Server saatis järgneva info:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Loobu</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Kinnita</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automaatne uuenduste kontroll</translation> </message> @@ -8080,6 +8122,19 @@ Keel: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8135,12 +8190,12 @@ Keel: %1</translation> <translation>Üleslaadimine</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Toiming aegus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Andmete ülekanne...</translation> </message> @@ -8166,8 +8221,8 @@ Keel: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Pole viga</translation> </message> @@ -8291,7 +8346,7 @@ Max</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8627,9 +8682,9 @@ Max</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>hapnik</translation> </message> @@ -8644,131 +8699,131 @@ Max</translation> <translation>Avatud süsteem</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>paskal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>kuupjalg</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>jalg/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>jalga/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>õhk</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integreeritud</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>vöö</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>pahkluu</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>seljaplaat</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>külgeriputatav</translation> </message> @@ -8845,123 +8900,123 @@ Max</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9060,149 +9115,149 @@ Max</translation> <translation>vale sündmuse nr</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Viga kuupäeva ja aja tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Sukeldumine %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Viga põhjaaja tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Viga max sügavuse tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Viga gaasisegude arvu tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Viga vee soolsuse saamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Viga pinnarõhu saamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Viga gaasisegu tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Ei saa luua parserit %s %s jaoks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Viga andmete registreerimisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9225,12 +9280,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>'%s' tuvastamine ebaõnnestus</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte %s</translation> </message> @@ -9261,8 +9316,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9524,17 +9579,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Ei leia gaasi %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9543,253 +9598,253 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Dekos </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (arvutatud)</translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Dekos (arvutatud) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (arvutatud)</translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (arvutatud) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (arvutatud)</translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (arvutatud) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Arvutatud lagi %.0f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Kude %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Kurss: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9838,142 +9893,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>ÕHK</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>HAPNIK</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Ei saa avada faili %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Number</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Aeg</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Õhu temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Vee temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Sukeldumisi kokku</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Laienda kõik</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Ahenda kõik kokku</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Väljasõidud</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistika</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Detailsem otsing</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Nähtavus</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Semu</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Ülikond</translation> </message> @@ -9984,180 +10039,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Märgendid</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Märkmed</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Näita rohkem detaile</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Aastane statistika</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Aasta</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Koguaeg</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Keskmine aeg</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Lühim aeg</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Pikim aeg</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Keskmine sügavus</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min sügavus</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max sügavus</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Keskmine SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Keskmine temp</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Tagasi nimekirja</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Sukeldumise #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Sukeldumise profiil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Sukeldumise info</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Sukeldumisvarustus</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tüüp</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Suurus</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Töörõhk</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Algusrõhk</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Lõpurõhk</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gaas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Sündmused</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nimi</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Väärtus</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinaadid</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Sukeldumise staatus</translation> </message> @@ -10187,62 +10242,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jaan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Veebr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Märts</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Juuni</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Juuli</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sept</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dets</translation> </message> @@ -10488,12 +10543,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sek</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max sügavus</translation> @@ -10519,77 +10579,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Märkmed:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Ehitusaasta</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Uppus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Põhjus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Lipuriik</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Laevatehas</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Laeva tüüp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Pikkus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Pikkus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Süvis</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Veeväljasurve</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Last</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Vraki andmed</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Kõrgus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Sügavus</translation> </message> @@ -10634,27 +10694,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Linn</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10669,7 +10729,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Eemalda punkt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10689,22 +10749,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Vigane vastus serverilt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Oodatava XML märgendi 'DiveDateReader' asemel on '%1'</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Oodatud XML märgendit 'DiveDates' ei leitud</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Vigane XML vastus. Rida %1: %2</translation> </message> @@ -10717,112 +10777,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Sukeldumiste nimekiri</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Luba pilve automaatne sünkro</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Seaded</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Lisa sukeldumine käsitsi</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Käsitsi sünkro pilvega</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Abi</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Lae GPS andmed üles</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Lae GPS andmed alla</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Näita GPS määrang</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Kustuta GPS vahemälu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Arendaja</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Teema info</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Kohta</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Käivita positsioneerimise teenus</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 934485146..6a5a23d35 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -167,160 +167,160 @@ <translation>Etsitään laitteita...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Etsintä päättyi onnistuneesti.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Paikallinen Bluetooth -laite oli %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>käynnistetty</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>sammutettu</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>PARITTAMATON</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PARITETTU</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTORISOITU_PARITETTU</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Tila: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Laitetta %1 voidaan käyttää yhteyden muodostukseen. Voita painaa Tallenna -painiketta.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Laite %1 pitää parittaa, jotta sitä voidaan käyttää. Käytä konteksti -valikkoa valitaksesi paritusvaihtoehdot.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Laitteella täytyy olla osoite yhteyttä varten (ei 0).</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Paikallinen laite on vaihdettu.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Parita</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Poista paritus</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Paritetaan laitetta %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Puretaan laitteen %1 paritus</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Laitteen %1 paritus on purettu.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Laite %1 on paritettu.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Laite %1 on autorisoitu ja paritettu.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Laitetta %1 voidaan käyttää yhteyden muodostukseen. Voita painaa Tallenna -painiketta.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Virhe paikallisella laitteella: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Paritusvirhe. Mikäli etälaite vaatii tietyn PIN-koodin, parita laitteet käyttäen käyttöjärjestelmän työkaluja.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Tuntematon virhe</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetooth -laite on sammutettu, kytke siihen virta ennen etsintää.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Virhe laitteen luku- tai kirjoitustoiminnassa.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Tapahtui tuntematon virhe.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Virhe etsittäessä laitteita: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Ei saatavilla</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Emme voi käyttää paikallista Bluetooth -laitetta.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Laitteiden etsintäagenttia ei voitu luoda, koska osoite %1 ei vastaa minkään paikallisen fyysisen sovittimen Bluetooth -osoitetta.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Henkilö:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Etsii sukelluskavereita ja divemastereita</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Ei kavereita</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Varmuuskopioi sukellustietokoneen asetukset</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Varmuuskopiot</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Virhe XML-varmuuskopioinnissa</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Virhe tallennettaessa varmistustiedostoa. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Varmistus onnistui</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Asetuksesi on tallennettu: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Palauta sukellustietokoneen asetukset</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML-tiedoston palautuksessa virhe</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Virhe varmistustiedoston palautuksessa. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Palautus onnistui</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Asetuksesi on palautettu onnistuneesti.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Valitse laiteohjelmiston tiedosto</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Kaikki tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Lokitiedostot</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Yhdistetään laitteeseen...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Yhdistetty laitteeseen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Yhteys laitteeseen katkaistu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation> </message> @@ -1973,22 +1973,22 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Sukelluksen yksityiskohdat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Poista sukellus</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Peru muutokset</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Näytä kartalla</translation> </message> @@ -1996,103 +1996,135 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Sukellus %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Päivä:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Kohde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinaatit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Käytä GPS -sijaintia:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Syvyys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Kesto:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Ilman lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Veden lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Massa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Säiliö:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Kaasuseos:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Alkupaine:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Loppupaine:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> @@ -2261,104 +2293,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Tiivistä muut</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Erota sukellukset retkestä</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Liitä uuteen retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisää sukellukset yläpuoliseen retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisää sukellukset alapuoliseen retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Liitä retki yllä olevaan retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Poista sukellukset</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Merkitse sukellukset epäkelvoiksi</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Yhdistä valitut sukellukset</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Numeroi uudelleen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Muuta sukellusaikoja</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Jaa valitut sukellukset</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Lataa kuvia tiedostoista</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Lataa kuve verkosta</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Kuvatiedostoja (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 ei vaikuta kuvalta</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Kuvatiedostot</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Avaa kuvatiedostot</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Kaikki tiedostot</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 ei vaikuta kuvalta</translation> </message> </context> <context> @@ -2559,7 +2606,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Vaalea</translation> </message> @@ -2569,121 +2616,121 @@ GPS location:</source> <translation>Hiekka</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Yleinen tiedostomuoto, jota käytetään sukelluslokien siirtämisessä eri sukellusohjelmistojen välillä.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Pilkulla erotettu lista, joka kuvaa sukelluksen syvyysprofiilin.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Pilkuilla erotettu lista sukelluksen tiedoista. Tässä on mukana suurin osa tiedoista, mutta ei sukellusprofiilia.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Lähetä sukellustiedot divelogs.de -verkkopalveluun.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Lähetä sukellusloki dive-share.appspot.com -web-sivustolle.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Tallenna sukelluskohteet HTML -tiedostoon, joka näyttää sijainnit maailmankartalla.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurfacen oma XML -tiedostomuoto.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Tallenna kuvien syvyydet tiedostoon.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Tallenna sukellus tiedostoon TeX -makroina.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Vienti UDDF -tiedostoon</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF-tiedostot</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX-tiedostot</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Vienti CSV -tiedostoon</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Vie maailmankartta</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Vie Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Tallenna kuvien syvyydet</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Vie TeX -tiedostoon</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Vie HTML -tiedostoihin</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Odota, vienti kesken...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Tiedoston avaus ei onnistu %s</translation> </message> @@ -3043,62 +3090,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>säiliö</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC -asetuspiste</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Sukellustyyppi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Pysähdysajat</translation> </message> @@ -3303,261 +3350,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Lämpö</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Säiliö</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Valokuvat</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Maa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Sukelluspari</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Syvyys(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Lämpö (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Massa(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>Pintakulutus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Kuvat sukelluksen aikana tai ennen/jälkeen</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>sukelluksia ei ole valittu</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>tyylitiedostoa divelogs.de:hen vientiin ei löytynyt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>zip -tiedoston luonti vientiä varten epäonnistui: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>sisäinen virhe</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Sukelluksen %1 muuntaminen divelogs.de:n muotoon epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>virhe zip -tiedoston kirjoittamisessa: %s zip virhe %d järjestelmävirhe %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Valmis</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Lähetetään sukelluslokia...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Ladataan sukelluslokia...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Ladataan %1 sukellusta...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Lataus päättynyt - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Virhe latauksessa</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Pakattua tiedostoa ei voitu avata: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Lataus on korruptoitunut</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Pakattua tiedostoa ei voitu avata: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Lähetys valmistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Lähetys epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Lähetys onnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Kirjautuminen epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Vastauksen jäsentäminen ei onnistu!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> @@ -3565,23 +3618,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Lataa</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Valitse latausmoodi Bluetoothille</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Muodostetaan yhteyttä sukellustietokoneeseen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Virhe</translation> </message> @@ -3591,42 +3644,47 @@ p, li { white-space: pre-wrap; } <translation>Etsi Uemis -sukellustietokone</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Peruuta lataus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Lokitiedostot</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Valitse tiedosto sukellustietokoneen muistin tallennukseen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Raakatiedostot</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Yritä latausta uudelleen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <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> @@ -3698,9 +3756,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Lataa</translation> </message> @@ -3726,7 +3784,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Peruuta</translation> </message> @@ -3741,57 +3799,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ei ole päällä</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Valmistajan nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Sukellustietokone:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Yhteys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Yritä uudestaan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Hae uudelleen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Ladatut sukellukset</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Tietoja:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Valitse kaikki</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Poista valinnat</translation> </message> @@ -3822,12 +3886,12 @@ p, li { white-space: pre-wrap; } <translation>Yhdistä Facebookiin tekstialue</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Käytä 'Jaa' -valikkoa katkaistaksesi Subsurfacen yhteyden Facebook-tunnukseesi.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Kirjaudu sisään luodaksesi yhteyden Facebookiin. Tämä mahdollistaa sukelluslokien julkaisun aikajanaasi suoraan Subsurfacesta</translation> </message> @@ -3835,22 +3899,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Kirjauduttiin onnistuneesti Facebookiin</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Virhe, tuntematon käyttäjätunnus, kirjautuminen epäonnistui.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Sukellus tallennettiin onnistuneesti Facebookiin</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Sukelluksen lähettäminen epäonnistui. Lähetä debug-tulostus Subsurfacen postituslistalle</translation> </message> @@ -3866,17 +3930,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Valitse kaikki</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Poista valinnat</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Käännä valinta</translation> </message> @@ -3931,18 +3995,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Etsi siirretyt kuvat</translation> + <source>Find moved media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Löydettiin kuvat</translation> + <source>Found media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Etsi vain valittujen sukellusten kuvia</translation> + <source>Match only media files in selected dive(s)</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3957,8 +4021,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Hae kuvia alihakemistoista</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3972,18 +4036,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>Vastaavia kuvia ei löytynyt</translation> + <source>No matching media files found</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>Löytyi <b>%1</b> kuvaa nykyisestä paikasta.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>Löytyi <b>%1</b> kuvaa uudesta paikasta:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4075,40 +4139,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Sijainti:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Kohde</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(sama GPS-kiinnitys)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 poissa</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n sukellus täällä)</numerusform><numerusform>, %n sukellusta täällä)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(Ei GPS tietoja, lisää GPS kiinnitys tästä sukelluksesta)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(ei GPS -tietoja)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Valitse kohde:</translation> </message> @@ -4116,7 +4180,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Sijaintia ei asetettu</translation> </message> @@ -4240,8 +4304,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> @@ -4262,19 +4326,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Ilman lämpötila</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Veden lämpötila</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -4355,8 +4419,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Valokuvat</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4389,53 +4453,53 @@ p, li { white-space: pre-wrap; } <translation>Lisää painojärjestelmä</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Ilman lämpötila [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Veden lämpötila [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Tätä sukellusretkeä muokataan.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Muokataan useita sukelluksia.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Tätä sukellusta muokataan.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Matkan muistiinpanot</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Matkakohde</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Uusi sukelluskohde</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Hylätäänkö muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Olet hylkäämässä muutoksesi.</translation> </message> @@ -4468,424 +4532,419 @@ p, li { white-space: pre-wrap; } <translation>Liitä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>Muuta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Jaa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>Uusi loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Uusi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Avaa loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Avaa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Tallenna nimellä...</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Sulje</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Sulje</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Tulosta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Asetukset</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Hae sukellustietokoneelta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Muokkaa laitenimeä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Lisää sukellus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>Muokkaa sukellusta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Kopioi sukelluksen osat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Liitä sukelluksen osat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>Numeroi uudelleen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Ryhmittele automaattisesti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Profiilikuvaaja</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Tiedot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Kaikki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Edellinen tietokone</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Seuraava tietokone</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Tietoja Subsurfacesta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Käyttöohje</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>Kartta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Sukelluksen suunnittelu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Liitä lokitiedostoja</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Tuo Divelogs.de -sivustolta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Kokoruututila</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Käytä kokoruututilaa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Tarkista päivitykset</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Vienti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Sukelluslokin vienti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Ohjelmoi sukellustietokone</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Muokkaa sukellussuunnitelmaa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Näytä/piilota pO₂ -kuvaaja</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Näytä/piilota pN₂ -kuvaaja</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Näytä/piilota pHe-kuvaaja</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Näytä/piilota sukellustietokoneen raportoima kattosyvyys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Näytä/piilota laskettu kattosyvyys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Näytä/piilota kaikkien kudosten laskenta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Näytä/piilota laskettu kattosyvyys 3m:n tarkkuudella</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Näytä/piilota syke</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Näytä/piilota MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Näytä/piilota EAD, END sekä EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Näytä/piilota NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Näytä/piilota hengitysnopeus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Näytä/piilota viivain</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Muuta kuvasuhdetta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Näytä/piilota kuvat</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Vaihda seospalkin tilaa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Suodata sukelluslista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Näytä kudosten saturaatiokartta (heat-map)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Käyttäjäkysely</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Peruuta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Tee uudelleen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Etsi siirretyt kuvat</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Avaa pilvitallennustila</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Tallenna pilveen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Hallinnoi sukelliskohteita</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Muokkaa sukelluskohteita</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Pilvitallennus yhdistetty</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Yhdistä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Katkaise yhteys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Yritetään yhdistää sukelluksia %1min "pinta-ajalla"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Templaatista otettiin varmuuskopio</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4908,214 +4967,214 @@ ei tule muokata suoraan, koska ne päivitettään automaattisesti uuden Subsurface-version myötä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Tallenna tai peruuta sukelluksen muutokset ennen yhdistämistä verkkoon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Sinulla on tallentamattomia muutoksia. Haluatko tallentaa ne pilvitallennustilaan? Mikäli et, muutokset synkronoidaan pilveen vasta, kun valitset "Avaa pilvitallennustila" tai "Tallenna pilveen"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Yhdistäminen pilveen epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Sukelluslokit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI-tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Kaikki tiedostot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Muutokset hylätään, jos et tallenna niitä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[paikallinen cache] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[pilvitallennus] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Avataan vanhan tiedostomuodon loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti. Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Otetaan yhteyttä pilvipalveluun...</translation> </message> @@ -5172,7 +5231,7 @@ QML-modulit QtPositioning tai QtLocation saattavat puuttua!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation> </message> @@ -5180,12 +5239,12 @@ QML-modulit QtPositioning tai QtLocation saattavat puuttua!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Sinun tulisi päivittää sukellustietokoneesi ohjelmisto (firmware): käytössä on versio %1, kun viimeisin vakaa versio on %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5194,27 +5253,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia ladatessasi ennen, kuin jatkat päivitystä</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Ei nyt</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Päivitä laiteohjelmisto</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Huomautus laiteohjelmiston päivityksessä</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Tallenna ladattu laiteohjelmisto nimellä</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware-tiedostot</translation> </message> @@ -5352,8 +5411,8 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Ei oletustiedostoa</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5377,6 +5436,7 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5407,29 +5467,54 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Tyhjennä kaikki asetukset</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Palauta kaikki asetukset oletusarvoihin</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Yleistä</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Avaa oletustiedosto</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5584,8 +5669,8 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Generoi uudet pikkukuvat, jos nykyiset ovat vanhempia kuin lähdekuva</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5624,7 +5709,7 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <translation>Näytä profiilissa keskisyvyys</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profiilikuvaaja</translation> </message> @@ -5704,26 +5789,26 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Näitä käytetään sellaisenaan. Et välttämättä halua tätä. Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Kirjainmerkit</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Ajan muotoilussa ei ole erikoismerkkejä</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Päiväyksen muotoilussa ei ole erikoismerkkejä</translation> @@ -5774,7 +5859,7 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurfacen pilvitallennustila</translation> </message> @@ -5799,73 +5884,58 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Tallenna salasana paikallisesti</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurfacen verkkopalvelu</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Oletuskäyttäjätunnus</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Verkko</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Ei välityspalvelinta</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Järjestelmän proxy -asetukset</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Muutos peruttu. Pilvipalvelun sähköpostiosoiteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Muutos peruttu. Pilvitallennuksen sähköpostiosoite ja uusi salasana voi sisältää vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurfacen pilvitallennustila (käyttäjä todennettu)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurfacen pilvitallennustila (virheellinen salasana)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurfacen pilvitallennustila (tarvitaan PIN)</translation> </message> @@ -6194,133 +6264,133 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Tuntematon sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Aseta ensimmäiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Suunniteltu sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Käsin lisätty sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Poista tämä sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (säiliö %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Aseta setpoint-muutos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Jaa sukellus kahtia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Muuta sukellustyyppi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Muokkaa profiilia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Muokkaa säiliön %1 painetta (arvioitu %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -6328,53 +6398,53 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Avaa paikallinen sukelluslokitiedosto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Paikallisen tiedoston avaus epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 sukellusta ladattu paikallisesta tiedostosta</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>käytä off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Virhe paikallisen tallenteen jäsentämisessä, keskeytetään</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Ei pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Syötä pilvipalvelun tunnuksent.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Virheellinen sähköpostiosoite</translation> </message> @@ -6424,50 +6494,50 @@ Tallenna muokkauksesi eri nimelle.</translation> <translation>Yhteys pilvitallennukseen epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Pilvitunnukset OK, ladataan sukelluksia...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Virhe pilvitallennuksessa: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Ladataan sukellukset paikallisesta tallennustilasta ('ei pilve' tila)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Tuntemattomat GPS -sijainnit</translation> </message> @@ -6475,7 +6545,7 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Ladataan...</translation> </message> @@ -6567,116 +6637,126 @@ Tallenna muokkauksesi eri nimelle.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Asetukset</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Tuntematon</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Virheellinen käyttäjätunnus tai salasana</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Tunnukset pitää varmentaa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Tunnukset varmistettu</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Off-line -tila</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Pilven tila</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Sähköposti</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Ei sovellu</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Muuta</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Tila</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Teema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Sininen</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>tavallinen teksti</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Korostus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Pinkki</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Tumma</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurfacen GPS -sijaintien verkkopalvelu</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Minimietäisyys (metriä)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Minimikesto (minuuttia)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Oletussäiliö</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Säiliö:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Kehittäjä</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Näytä kehittäjävalikko</translation> </message> @@ -6711,15 +6791,14 @@ Tallenna muokkauksesi eri nimelle.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Varoitus! -Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuuttia).</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Lataa kuvat vaikka niiden ajankohta ei osu sukelluksen aikaan</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6742,38 +6821,38 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <translation>Mikä päivä ja aika näkyy kuvassa?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Avaa kuvatiedosto</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Kuvatiedostot</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Valitun sukelluksen päivä/aika</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Ensimmäisen valitun sukelluksen päivä/aika</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Viimeisen valitun sukelluksen päivä/aika</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation>Tiedostot virheellisellä päivällä/ajalla</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Päivää/aikaa ei löytynyt Exif-tiedoista</translation> </message> @@ -6866,28 +6945,28 @@ Files with inappropriate date/time</source> <translation>Tuo viestit (virheet, varoitukset jne.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Avaa SmartTrak -tiedostot</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak-tiedostot</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Kaikki tiedostot</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurfacen tiedostot</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Avaa Subsurfacen tiedostot</translation> </message> @@ -6895,64 +6974,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pieni</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Keskimääräinen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Sukelluspäivä: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Kesto: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sukelluskohde: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Sukelluspari: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7089,65 +7168,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Syötä käyttäjätunnus ja näpäytä Lataa</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Verkkopalvelu</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Yhdistetään...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Lataus valmistui</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Virhe latauksessa: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Yhteysvirhe:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Tuntematon käyttäjä!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Vastauksen jäsentäminen ei onnistu!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Lataus onnistui</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Puvut:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Pukua ei asetettu</translation> </message> @@ -7278,39 +7309,44 @@ Files with inappropriate date/time</source> <translation>Zoomi</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Lataa kuvia tiedostoista</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Lataa kuvia verkosta</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Poista valitut kuvat</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Poista kaikki kuvat</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Generoi valitut pikkukuvat uudelleen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Poistetaan kuvia</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Haluatko varmasti poistaa kaikki kuvat?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7478,15 +7514,15 @@ sekoittaa ilmasta ja käyttäen: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Avainsanat:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Avainsanat</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Tyhjennä avainsanat</translation> </message> @@ -7685,7 +7721,7 @@ sekoittaa ilmasta ja käyttäen: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>napauta %1 pohjassa avataksesi %2</translation> </message> @@ -7709,130 +7745,135 @@ sekoittaa ilmasta ja käyttäen: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation> (näytetään %1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Syvyys(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Lämpö (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Säiliö</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Sukelluspari</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Massa(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>Pintakulutus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Kuvat sukelluksen aikana tai ennen/jälkeen</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Maa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -7846,81 +7887,81 @@ sekoittaa ilmasta ja käyttäen: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Syötä kuvien osoite (URL)</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Tarkista päivitykset.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Päivitysten tarkistus epäonnistui.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Tapahtui seuraava virhe:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Tarkista Internetyhteys.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Käytössä on uusin versio Subsurfacesta.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Saatavilla on uusi versio Subsurfacesta.<br/>Näpäytä:<br/><a href="%1">%1</a><br/> ladataksesi sen.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Saatavilla on uusi versio Subsurfacesta.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Uusin versio on %1, tarkista %2 lataussivultamme %3 päivitysohjeiksi.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Uusin julkaistu versio on</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Palvelin palautti seuraavan tiedon:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Tarkistetaan joka toinen viikko uuden version saatavuus. Mikäli et halua tarkistusta tehtävän, valitse kieltävä painike.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Kieltäydy</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Päivitysten automaattinen tarkistus</translation> </message> @@ -8096,6 +8137,19 @@ Kieli: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8151,12 +8205,12 @@ Kieli: %1</translation> <translation>Lähetä</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Toimenpide ei valmistunut ajoissa</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Tietoa siirretään...</translation> </message> @@ -8182,8 +8236,8 @@ Kieli: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Ei virhettä</translation> </message> @@ -8307,7 +8361,7 @@ Keski</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Virhe otsaketietojen tulkinnassa</translation> </message> @@ -8644,9 +8698,9 @@ Keski</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>happi</translation> </message> @@ -8661,131 +8715,131 @@ Keski</translation> <translation>Avoin kierto</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>ilma</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integroitu</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>vyöpaino</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>nilkkapaino</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>selkälevy</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8862,123 +8916,123 @@ Keski</translation> <translation>Sukellusprofiilia ei löytynyt '%s':sta</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Ladattu tallennustilasta (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Siirrä tallennustilasta (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Siirrä tallennustilaan (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Paikallinen välimuistihakemisto %s on korruptoitunut - synkronointi Subsurfacen pilvitallennustilaan ei onnistu</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Paikallisen kopion päivitys uudempaan etäversioon epäonnistui</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Virhe: Subsurfacen pilvitallennustila on korruptoitunut</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Virhe: Subsurfacen pilvitallennustilan päivitys epäonnistui, yritä myöhemmin uudelleen</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Etä- ja paikallinen tallennus eroavat toisistaan. Error: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Virhe: paikallinen- ja pilvitadata eroavat toisistaan. Emme voi yhdistää näitä keskenään</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Virhe: paikallinen ja pilvidata eroavat toisistaan</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Paikallinen ja pilvidata eroavat toisistaan. Virhe: tiedon tallennus epäonnistui (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Virhe: ongelmia paikallisen pilvidatan kopion kanssa</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Paikallinen kopio siirretty %s. Ole hyvä ja yritä toimintoa uudelleen.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Päivitä paikallinen tallennustila vastaamaan pilvipalvelua</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Tallenna paikalliset muutokset pilvitallennustilaan</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Yritä yhdistää paikalliset muutokset pilvitallennustilaan</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Tallenna tiedot pilvitallennustilaan</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Synkronoi pilvitallennustila</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Lukeminen pilvitallennustilasta epäonnistui, käytetään paikallista dataa</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Onnistunut yhteys pilvitallennustilaan, haetaan tiedot</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Synkronointi pilvitallennustilaan valmis</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Virhe: yhteys Subsurfacen pilvitallennustilaan</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>lokin %s haku epäonnistui (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Synkronoidaan tiedot</translation> </message> @@ -9077,119 +9131,119 @@ Keski</translation> <translation>tuntematon tapahtumanumero</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Sukellus %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Virhe lämpötilan jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Virhe kaasuseosten määrän jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Virhe sukellusmoodin kanssa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Jäsentäjän luominen %s %s epäonnistui</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Sukellus on jo ladattu %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>malli=%s firmware=%u sarjanumero=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Virhe avattaessa laitetta %s %s (%s). Ongelman selvittämiseksi tarvitaan yleensä lokitiedostot. Voit kopioida ne leikepöydälleä Tietoja valikon kautta.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9198,13 +9252,13 @@ Ongelman tutkimiseksi libdivecomputer lokitiedosto on hyödyllinen. Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus -dialogista.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Uusia sukelluksia ei ladattu sukellustietokoneesta</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>sukelluskohteella on useita GPS -positioita; %s @@ -9212,19 +9266,19 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>Ylimääräinen nimi sukelluskohteelle: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Lataa sukellukset paikallisesta välimuistista</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Sukellusdatan avaus onnistui</translation> </message> @@ -9247,12 +9301,12 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Tiedoston '%s' lukeminen epäonnistui.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %s avaus ei onnistu</translation> </message> @@ -9283,8 +9337,8 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>, efektiivinen GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>SP:n mutos</translation> </message> @@ -9547,17 +9601,17 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9566,84 +9620,84 @@ S: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>N: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Turvapysähdys: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9652,7 +9706,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9661,174 +9715,174 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Tiheys: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Turvapysähdys: tuntematon kesto @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: tuntematon kesto @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Dekossa</translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (lask.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Dekossa (lask.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (lask.) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (lask.) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Laskettu katto %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Kudos %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD johtavassa kudoksessa </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>sydämen syke: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>suunta: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Keskisyvyys tähän asti %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sS:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sS:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sN:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sN:%.2f%s</translation> </message> @@ -9877,142 +9931,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Ilma</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>yli %1 päivää</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n sukelluksia)</numerusform><numerusform>(%n sukellusta)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>HAPPI</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Tiedoston avaus ei onnistu %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Numero</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Kello</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Ilman lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Veden lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Sukelluksia</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Retkiä</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Tilastot</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Laajennettu haku</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Näkyvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Sukellusvanhin</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Sukelluspari</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Puku</translation> </message> @@ -10023,180 +10077,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Näytä lisää yksityiskohtia</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Vuosi</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Kokonaisaika</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Keskimääräinen kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Lyhin kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Pisin kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Keskisyvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Pienin syvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Suurin syvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Pienin pintakulutus</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Suurin pintakulutus</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Keskilämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Alin lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Ylin lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Takaisin listalle</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Sukellus</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Sukellusprofiili</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Sukellustiedot</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Sukellusvarusteet</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tyyppi</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Tilavuus</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Paineluokka</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Alkupaine</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Loppupaine</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Tapahtumat</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nimi</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Arvo</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinaatit</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Sukelluksen tila</translation> </message> @@ -10226,62 +10280,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Kaikki (matkan tilastojen mukaan)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>tammi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>helmi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>maalis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>huhti</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>touko</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>kesä</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>heinä</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>elo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>syys</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>loka</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>marras</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>joulu</translation> </message> @@ -10531,12 +10585,17 @@ Onko Uemis Zurich kytketty oikein?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sek</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Suurin syvyys:</translation> @@ -10562,77 +10621,77 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Käännetty</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Upposi</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Sukellusaika</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Syy</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Kansallisuus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Telakka</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Aluksen tyypp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Pituus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Puomi</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Kuivuus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Syrjäytys</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Lasti</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Hylyn tiedot</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Korkeus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Syvyys</translation> </message> @@ -10659,7 +10718,7 @@ Onko Uemis Zurich kytketty oikein?</translation> <message> <location filename="../core/taxonomy.c" line="11"/> <source>State</source> - <translation>Osavaltio</translation> + <translation>Tila</translation> </message> <message> <location filename="../core/taxonomy.c" line="12"/> @@ -10677,27 +10736,27 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Kaupunki</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Tallenna tiedot</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Tallenna sukellukset</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Paikallisen välitallennustilan luonti valmis</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Valmistellaan datan tallennus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>vaihda moodia</translation> </message> @@ -10712,7 +10771,7 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Poista tämä etappi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation> </message> @@ -10732,22 +10791,22 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Korkein</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Virheellinen vastaus palvelimelta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Odotettu XML tägi on 'DiveDateReader', mutta saatiin '%1'</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Odotettua XML -tägiä 'DiveDates' ei löydy</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Virheellinen XML vastasu. Rivi %1: %2</translation> </message> @@ -10760,112 +10819,102 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Subsurface-mobiili</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Sukellusten hallinta</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Poista automaattinen pilvisynkronointi käytöstä</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Ota automaattinen pilvisynkronointi käyttöön</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Disabloi sijaintipalvelu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Asetukset</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Lisää sukellus käsin</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Lataa sukellustietokoneelta</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Synkronoi kerran pilvipalveluun</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Tiedot tallennetaan vain paikallisesti, kun poistat automaattisen pilvipalvelusynkronoinnin käytöstä. Tämä voi olla hyödyllistä, kun käytössä on huono verkkoyhteys. Valitse 'Synkronoi kerran pilvipalveluun', kun olet toimivassa verkossa ja haluat synkronoida tietosi pilvipalveluun.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Ohje</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Vie GPS -tiedot</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Käytä GPS-sijainteja</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Lataa GPS -tiedot</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Näytä GPS -sijainnit</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Tyhjennä GPS:n väliaikaistiedot</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Kehittäjä</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Sovellusloki</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Teeman tiedot</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Tietoja</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Käytä sijaintipalvelua</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 6e94ca1f5..b6423dd8e 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -167,160 +167,160 @@ <translation>Recherche des périphériques distants...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Recherche terminée avec succès.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Le périphérique Bluetooth local était %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>allumé</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>éteint</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>APPAIRAGE_AUTORISÉ</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [État : %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Le périphérique %1 peut être utilisé pour la connexion. Vous pouvez cliquer sur le bouton Enregistrer.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Le périphérique %1 doit être appairé pour être utilisé. Veuillez utiliser le menu pour les options d'appairage.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Un périphérique a besoin d'une adresse non nulle pour une connexion</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Le périphérique local a été modifié.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Appairer</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Supprimer l'appairage</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Tentative d'appairage avec le périphérique %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Tentative de desappairage avec le périphérique %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Le périphérique %1 a été désappairé.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Le périphérique %1 a été appairé.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Le périphérique %1 a été appairé et est autorisé.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Le périphérique %1 peut maintenant être utilisé pour la connexion. Vous pouvez cliquer sur le bouton Enregistrer.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Erreur du périphérique local : %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Erreur d'appairage. Si le périphérique distant nécessite un code PIN personnalisé, veuillez essayer d'appairer votre périphérique avec votre système d'exploitation. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Erreur inconnue</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>L'adaptateur Bluetooth est éteint, l'allumer avant de lancer la recherche.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>L'écriture ou la lecture sur le périphérique a provoqué une erreur.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Une erreur inconnue s'est produite.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Erreur de découverte de périphérique : %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Non disponible</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Impossible de communiquer avec l'interface Bluetooth locale</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>L'agent de découverte des périphériques n'a pas été créé car l'adresse %1 ne correspond à aucune adresse de périphérique Bluetooth local.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Personne : </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Recherche d'équipiers et de moniteurs</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Aucun partenaire</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Sauvegarder les paramètres de l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Fichiers de sauvegarde (backup)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Erreur de sauvegarde XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Une erreur s'est produite lors de l'enregistrement du fichier de sauvegarde. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Sauvegarde réussie</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Vos paramètres ont été enregistrés vers : %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Restaurer les paramètres de l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Erreur de restauration XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Une erreur s'est produite lors de la restauration du fichier de sauvegarde. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>La restauration s'est effectuée avec succès</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Vos paramètres ont été restaurés avec succès.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Sélectionner le fichier de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Tous les fichiers</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Fichiers log</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Connexion au périphérique...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Connecté au périphérique</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Déconnecté du périphérique</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Choisir le fichier pour le téléchargement du fichier log de l'ordinateur de plongée</translation> </message> @@ -1973,22 +1973,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Détails de la plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Supprimer la plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Annuler les modifications</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Afficher sur la carte</translation> </message> @@ -1996,104 +1996,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Plongée n°%1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Date :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Lieu :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordonnées :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Utiliser la position GPS actuelle :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Profondeur :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Durée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Température de l'air :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Température de l'eau :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Combinaison :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Équipier :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Moniteur / Guide de palanquée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Poids:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Bloc :</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Mélange de Gaz</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Pression initiale</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Pression finale</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Évaluation :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibilité :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notes :</translation> </message> @@ -2262,104 +2294,119 @@ GPS actuelle :</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Replier les autres</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Supprimer la plongée(s) du voyage</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Créer un nouveau voyage au-dessus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Ajouter la (les) plongée(s) au voyage immédiatement ci-dessous</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Fusionner le voyage avec le voyage du dessus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Fusionner le groupe avec le voyage du dessous</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Effacer des plongée(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marquer des plongée(s) comme invalides</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Fusionner les plongées sélectionnées</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renuméroter des plongée(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Décaler l'heure des plongées</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Diviser les plongées sélectionnées</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Charger le(s) image(s) à partir du(des) fichier(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Charger l'image depuis le web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Fichiers images (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 ne semble pas être une image</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Fichiers image</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Ouvrir les fichiers images</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Tous les fichiers</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 ne semble pas être une image</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS actuelle :</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Clair</translation> </message> @@ -2570,121 +2617,121 @@ GPS actuelle :</translation> <translation>Sable</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Format générique utilisé pour l'échange de données entre plusieurs logiciels de plongée</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valeurs séparées par des virgules décrivant le profil de plongée.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valeurs séparées par des virgules pour les informations de plongée. Cela inclut la plupart des détails de plongée mais aucune information de profil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Envoyer les données de la plongée au site divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Envoyer les données de la plongée au site dive-share.appspot.com</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Export HTML des lieux de plongées, indiqués sur une carte du monde</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Format XML natif de Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Sauvegarder les profondeurs des images dans le fichier.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Sauvegarde la plongée en macro TeX dans un fichier.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exporter le fichier UDDF en</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>Fichiers UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>Fichiers CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>Fichiers HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>Fichiers TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exporter le fichier CSV en</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exporter la carte mondiale</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exporter vers fichier XML Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Sauvegarder la profondeur de l'image</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exporter dans un fichier TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exporter le fichier HTML comme</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Veuillez patienter, exportation...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Impossible d'ouvrir le fichier %s</translation> </message> @@ -3044,62 +3091,62 @@ GPS actuelle :</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>bloc</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Prof. finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gaz utilisés</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>Setpoint CC</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Mode de plongée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>temps d'arrêts</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Bloc</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>SNC max</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Photos</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Pays</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Partenaire</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Profondeur (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Température (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Poids (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Photos avant/durant/après la plongée</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>Aucune plongée sélectionnée</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>La feuille de style pour exporter vers divelogs.de n'a pas été trouvée</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>Erreur de création du fichier zip pour envoi : %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>Erreur interne</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>La conversion de la plongée %1 au format divelogs.de a échoué</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>erreur lors de l'écriture du fichier zip : %s erreur zip %d erreur système %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Terminé</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Envoi de la liste des plongées</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Téléchargement de la liste des plongées...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Téléchargement en cours de %1 plongées...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Téléchargement terminé - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Erreur de téléchargement</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>L'archive n'a pas pu être ouverte : </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Téléchargement corrompu</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>L'archive ne peut pas être ouverte : %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Envoi terminé</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Échec de l'envoi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Envoi terminé avec succès</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Échec de connexion</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Impossible d'analyser la réponse</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Télécharger</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Choisir le mode de téléchargement Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Connexion vers l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Erreur</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Trouver l'ordinateur de plongée Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Annuler le téléchargement</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Choisir le fichier pour le téléchargement du fichier log de l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Fichiers log</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Choisir le fichier pour les données brutes binaires de libdivecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Fichiers dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Réessayer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Sauvegarder les données brutes de libdivecomputer NE téléchargera PAS les plongées dans la liste des plongées.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Télécharger</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Le Bluetooth n'est pas activé</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Nom du fournisseur :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Ordinateur de plongée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Connexion :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Réessayer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Rescanner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Plongées téléchargées</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Tout désélectionner</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Se connecter à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Déconnectez-vous de Facebook en utilisant le menu 'Partager sur'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Identifiez-vous à Facebook afin de publier vos plongées sur votre profil</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Connexion à Facebook réussie</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Erreur, identifiant inconnu, impossible de se connecter.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Plongée envoyée avec succès à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Échec de l'envoi de la plongée. Veuillez vérifier les informations de débogage et les envoyer à liste de diffusion de Subsurface</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Tout désélectionner</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inverser la sélection</translation> </message> @@ -3932,58 +3996,58 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> <source>Scanning:</source> - <translation type="unfinished"/> + <translation>Recherche:</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> <source>Select folder and scan</source> - <translation type="unfinished"/> + <translation>Sectionner le dossier de recherche</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Traverser les dossiers d'images</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> <source>Stop scanning</source> - <translation type="unfinished"/> + <translation>Arrêter la recherche</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation type="unfinished"/> + <translation>Recherche interrompue - le résulta peu être incomplet</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Lieu : </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Lieu</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (point GPS identique)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (distant d'environ %1</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n plongée ici)</numerusform><numerusform>, %n plongée(s) ici)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(Aucune donnée GPS existante, ajouter un point GPS à partir de cette plongée)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(Aucune donnée GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Choisir un site : </translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Lieu non défini</translation> </message> @@ -4242,8 +4306,8 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -4264,19 +4328,19 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Température de l'air</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Température de l'eau</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -4357,8 +4421,8 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Photos</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Ajouter un système de poids</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temp. de l'air. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temp. de l'eau. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Ce voyage est en cours d'édition.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Plusieurs plongées sont en cours d'édition.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Cette plongée est en cours d'édition.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Notes de voyage</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Lieu du voyage</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nouveau site de plongée</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Abandonner les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Vous perdrez les modifications non enregistrées.</translation> </message> @@ -4470,424 +4534,419 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>&Importer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Édition</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Partager sur</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Nouveau carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nouveau</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Ouvrir un carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Ouvrir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Sauvegarder</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Sauvegarder</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Enre&gistrer sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Enregistrer sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Fermer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Fermer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Imprimer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&références</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Quitter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importer depuis l'&ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importer les données &GPS depuis le service web Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Éditer les &noms des ordinateurs de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Ajouter une plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Éditer la plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copier les composants de la plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>C&oller les composants de la plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renuméroter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>&Grouper automatiquement</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Liste des plongées</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Informations</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Générale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Ordinateur P&récédent</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Ordi&nateur Suivant</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&À propos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manuel utilisateur</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Carte</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanifier une plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importer des fichiers de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importer les fichiers de plongée depuis d'autres applications</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importer &depuis divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Plein écran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Commuter en mode plein écran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Vérifier les mises à jour</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exporter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exporter les plongées</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configurer l'&ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Éditer la plongée &dans le planificateur</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Commuter le graphique de la pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Commuter le graphique de la pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Commuter le graphique de la pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Commuter le plafond rapporté par l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Commuter le plafond calculé</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Commuter le calcul de tous les tissus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Commuter le plafond calculé avec des incréments de 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Commuter le rythme cardiaque</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Commuter la MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Commuter la EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Commuter la LND, DTR</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Commuter le taux SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Commuter la règle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Ajuster l'échelle du graphique </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Commuter l'affichage des images</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Commuter l'affichage des gaz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrer la liste des plongées</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Commuter le graphique des tissus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>&Sondage</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Annuler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Refaire</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Trouver des images déplacées</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Ouvrir le stockage dans le c&loud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Enregistrer vers le clo&ud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Gérer les sites de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Modification des sites de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Stockage cloud en ligne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Se connecter à</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Se déconnecter de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Ouvrir un fichier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Tentative de fusion des plongées compris dans un intervalle de temps de %1 minutes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Sauvegarde du modèle créée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,214 +4969,214 @@ sont en lecture seule et ne doivent pas être modifiés directement, puisque l'application peut les écraser au démarrage.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de se connecter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Vous avez des modifications non enregistrées. Voulez-vous les envoyer vers le stockage cloud ? Si vous répondez non, le cloud ne sera synchronisé qu'au prochain appelle de "Ouvrir le stockage dans le cloud" ou "Enregistrer vers le cloud".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentative de replanification d'une plongée qui n'est pas une plongée planifiée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Merci de finir l'édition en cours avant d'en commencer une autre.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Fichiers de carnet de plongées</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>Fichiers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>Visualiseur de log APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Tous les fichiers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Ouverture du fichier de données à partir d'une version antérieure</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Vous avez ouvert un fichier de données d'une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée. Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Ouvrir le fichier de carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Contact du service cloud...</translation> </message> @@ -5174,7 +5233,7 @@ Les modules QML QtPositionning et QtLocation pourrait être manquant !</translat <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Le filtre affiche %1 (de %2) plongées</translation> </message> @@ -5182,12 +5241,12 @@ Les modules QML QtPositionning et QtLocation pourrait être manquant !</translat <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Vous devriez mettre à jour le firmware de votre ordinateur de plongée : vous utilisez actuellement la version %1 mais la dernière version stable est la %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5196,27 +5255,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Si votre périphérique utilise le Bluetooth, effectuez la même préparation que pour un téléchargement de carnet de plongée avant de continuer avec la mise à jour</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Pas maintenant</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Mettre à jour le firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Information de mise à jour de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Enregistrer le firmware téléchargé sous</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Fichiers firmware</translation> </message> @@ -5354,8 +5413,8 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Aucun fichier par défaut</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5379,6 +5438,7 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5409,29 +5469,54 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Supprimer tous les paramètres</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Réinitialiser tous les paramètres à leur valeur par défaut</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Général</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Ouvrir le carnet de plongée par défaut</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5586,8 +5671,8 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Recalculer la miniature si plus ancienne que l'image</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5626,7 +5711,7 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>Afficher la profondeur moyenne dans le profile</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5705,27 +5790,27 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Cela sera utilisé tel quel. Ce n'est peut-être pas ce que vous attendiez. Voir http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caractères littéraux</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Caractères non spéciaux dans le format de date. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Caractères non spéciaux dans le format de date. @@ -5777,7 +5862,7 @@ Voir http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Stockage Subsurface dans le cloud</translation> </message> @@ -5802,73 +5887,58 @@ Voir http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Sauvegarder le mot de passe localement ?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Service web de Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID utilisateur par défaut</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Sauvegarder l'ID utilisateur localement ?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Sans proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Proxy système</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Modification ignorée. L'e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Modification ignorée. L'e-mail et le nouveau mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>L'e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Stockage Subsurface dans le cloud (Informations de connexion vérifiés)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Stockage cloud de Subsurface (mot de passe incorrect)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Stockage cloud de Subsurface (PIN nécessaire)</translation> </message> @@ -6197,133 +6267,133 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (n°%1 sur %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Ordinateur de plongée inconnu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>L'affichage de la LND/DTR est désactivée à cause d'un temps de calcul excessif</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Choisir comme odinateur principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Plongée planifiée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Plongée ajoutée manuellement </translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(Bloc. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Ajouter un changement de setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Ajouter un signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> - <translation type="unfinished"/> + <translation>séparer la plongée en deux</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Modifier le mode de plongée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Modifier le profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Supprimer l'évènement</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Masquer les évènements similaires</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Afficher tous les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Masquer les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Masquer tous les évènements %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Supprimer l'évènement sélectionné ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Le nom est trop long !</translation> </message> @@ -6331,53 +6401,53 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Démarrage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Ouvrir les données de plongée local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>L'ouverture du fichier local de données a échoué</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 plongées chargées depuis le fichier local de données de plongées</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>Travail hors-ligne</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Erreur d'analyse du fichier de stockage local, abandon</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Pas d'information de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Entrez vos informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>L'e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Format invalide pour l'adresse e-mail</translation> </message> @@ -6427,50 +6497,50 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Informations de connexion au cloud valides, chargement des plongées...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Erreur cloud : %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Chargement des plongées depuis le stockage local (mode 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Echec de la connexion vers le serveur cloud, retour vers l'état sans cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Stockage cloud ouvert avec succès. Aucune plongée dans la liste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Location GPS inconnue</translation> </message> @@ -6478,7 +6548,7 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Démarrage</translation> </message> @@ -6570,116 +6640,126 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Paramètres</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Non défini</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Couple identifiant / mot de passe incorrect</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Les informations de connexion doivent être vérifiées</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Informations de connexion vérifiées</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Pas de mode cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>État du cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-mail</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Non applicable</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Modifier</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Statut</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Thème</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Bleu</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>regular text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Surligner</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rose</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Noir</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Webservice Subsurface de données GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Distance limite (mètres)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Temps limite (minutes)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Bloc par défaut</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Bloc :</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Développeur</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Afficher le menu développeur</translation> </message> @@ -6714,16 +6794,14 @@ Merci d'exporter ce modèle vers un fichier différent.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Attention ! -Toutes les images ne possèdent pas un horodatage situé dans un intervalle -de 30 minutes avant le début de la plongée et 30 minutes après la fin.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Charger les images même si l'heure ne correspond pas à l'heure de la plongée</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6746,39 +6824,39 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans <translation>Quelle est l'heure et la date affiché par l'image ?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Ouvrir un fichier image</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Fichiers image</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Date et heure de la plongée sélectionnée</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Date et heure de la première plongée sélectionnée</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Date et heure de la dernière plongée sélectionnée</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Fichiers avec dates/heures incorrectes</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Aucune date/heure Exif trouvée</translation> </message> @@ -6871,28 +6949,28 @@ Fichiers avec dates/heures incorrectes</translation> <translation>Importer les messages (erreurs, alertes, etc.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Ouvrir les fichiers SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>Fichiers SmartTrack</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Tous les fichiers</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Fichiers Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Ouvrir les fichiers Subsurface</translation> </message> @@ -6900,64 +6978,64 @@ Fichiers avec dates/heures incorrectes</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Petit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Moyen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Date de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Lieu de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Équipier(s) : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Guide/Moniteur : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7094,65 +7172,17 @@ Fichiers avec dates/heures incorrectes</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Entrez l'ID utilisateur et cliquez sur télécharger</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Service web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Connexion en cours...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Téléchargement terminé</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Erreur de téléchargement : %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Erreur de connexion : </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Identifiant utilisateur incorrect !</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Impossible d'analyser la réponse !</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Téléchargement réussi</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Combinaisons : </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Pas de combinaison définie</translation> </message> @@ -7283,39 +7313,44 @@ Fichiers avec dates/heures incorrectes</translation> <translation>Niveau de zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Charger le(s) image(s) à partir des fichier(s)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Charger le(s) image(s) à partir du web</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Supprimer les images sélectionnées</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Supprimer toutes les images</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Recalculer les miniatures sélectionnées</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Suppression des images</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Voulez-vous vraiment supprimer toutes les images?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7483,15 +7518,15 @@ mélangés à partir de l'air et en utilisant : <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Étiquettes : </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Étiquettes</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Étiquettes vides</translation> </message> @@ -7690,7 +7725,7 @@ mélangés à partir de l'air et en utilisant : <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1cliquer pour visiter %2</translation> </message> @@ -7714,130 +7749,135 @@ mélangés à partir de l'air et en utilisant : <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 affiché(s))</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Profondeur (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Température (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Bloc</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>SNC Max.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Partenaire</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Poids (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Photos avant/durant/après la plongée</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Pays</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -7851,81 +7891,81 @@ mélangés à partir de l'air et en utilisant : </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Entrez l'URL pour les images</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Vérifier les mises à jour.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface n'a pas été en mesure de vérifier les mises à jour.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>L'erreur suivante est apparue :</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Vérifiez votre connexion Internet.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Vous utilisez la dernière version de Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Une nouvelle version de Subsurface est disponible.<br/>Téléchargez-là sur :<br/><a href="%1">%1</a><br/></translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Une nouvelle version de Subsurface est disponible.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>La dernière version est %1, vérifiez %2 notre page de téléchargement %3 pour savoir comment mettre à jour.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>La version la plus récente est </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Le serveur a renvoyé l'information suivante :</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface vérifie toutes les deux semaines si une nouvelle version est disponible. Si vous ne souhaitez plus que Subsurface fasse cette vérification, cliquez sur Refuser.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Refuser</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Vérification automatique des mises à jour</translation> </message> @@ -8102,6 +8142,19 @@ Langue : %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8157,12 +8210,12 @@ Langue : %1</translation> <translation>Envoyer</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Temps de réponse dépassé pour l'opération</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Transfert des données en cours...</translation> </message> @@ -8188,8 +8241,8 @@ Langue : %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Aucune erreur</translation> </message> @@ -8313,7 +8366,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Erreur d'analyse de l'entête</translation> </message> @@ -8651,9 +8704,9 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxygène</translation> </message> @@ -8668,131 +8721,131 @@ Maximum</translation> <translation>Circuit ouvert</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>Nitrox%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>intégré</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>ceinture</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>cheville</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8869,123 +8922,123 @@ Maximum</translation> <translation>Aucun profil de plongée trouvé depuis '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Récupération à partir du stockage (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transfert à partir du stockage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transfert vers le stockage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Dossier de cache local %s corrompu - impossible de synchroniser avec le stockage cloud de Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Impossible de mettre à jour le cache local vers les données distantes plus récentes</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Stockage cloud de Subsurface corrompu</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Impossible de mettre à jour le stockage cloud de Subsurface, réessayez plus tard</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Le stockage distant et les données locales divergent. Erreur : impossible de fusionner (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Les données du stockage local et du distant ont divergées. Impossible de combiner les modifications locales et distantes</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Les données du stockage local et du distant ont divergées.</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Les données du stockage local et du distant ont divergées. Erreur : l'écriture des données a échoué (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problèmes avec le cache local des données du cloud Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Données mises en cache déplacées vers %s. Veuillez retenter l'opération.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Mise à jour du stockage local pour correspondre au stockage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Pousser les modifications locales vers le stockage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Essai de fusion des modifications locales vers le stockage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Enregistrer les données dans le stockage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Synchroniser avec le stockage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Impossible de contacter le serveur cloud, utilisation des données locales</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Connecté au cloud, téléchargement des données distantes</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Synchronisation avec le stockage cloud effectuée</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Erreur de connexion au stockage Subsurface dans le cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone de %s a échoué (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Synchronisation du fichier de données</translation> </message> @@ -9084,119 +9137,119 @@ Maximum</translation> <translation>numéro d'évènement non valide</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Erreur d'analyse de la date</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Plongée %d : %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Erreur d'analyse de la durée de plongée</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Erreur d'analyse de la profondeur maximale</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Erreur d'analyse de la température</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Erreur d'analyse du nombre de mélanges gazeux</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Erreur lors de l'obtention de la salinité de l'eau</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Erreur lors de l'obtention de la pression en surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Erreur lors de l'obtention du mode de plongée</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Erreur d'analyse du mélange gazeux</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Impossible de créer un analyseur pour %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Erreur d'analyse des échantillons</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Plongées déjà téléchargées le %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Évènement : attente d'une action de l'utilisateur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>modèle=%s firmware=%u série=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'évènements.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'annulation.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Erreur d'import des données de plongées</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Erreur lors de l'ouverture du périphérique %s %s (%s). La plupart du temps, pour déboguer ce problème, il est utile d'envoyer aux développeurs, les fichiers log. Vous pouvez les copier dans le presse-papier, à partir la fenêtre À propos.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9205,13 +9258,13 @@ La plupart du temps, pour déboguer ce problème, un fichier log de libdivecompu Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans la fenêtre de téléchargement.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Aucune nouvelle plongée téléchargée depuis l'ordinateur de plongée</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Emplacement GPS multiples pour le site de plongée; également %s @@ -9219,19 +9272,19 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>Noms supplémentaires pour le site : %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Chargement des plongées depuis le cache local</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Succès de l'ouverture des données de plongée</translation> </message> @@ -9254,12 +9307,12 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Impossible d'analyser '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -9290,8 +9343,8 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>, GF effectif = %d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Changer SP</translation> </message> @@ -9553,17 +9606,17 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>valeur pO₂ basse %.2f à %d:%02u avec le gaz %s à la profondeur de %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Impossible de trouver le gaz %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>nitrox</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9572,84 +9625,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC : %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>SNC : %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD : %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Déco : %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Palier de sécurité : %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P : %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9658,7 +9711,7 @@ EADD : %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9667,63 +9720,63 @@ EADD : %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densité : %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Palier de sécurité : temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Déco : temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>En déco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>LND : %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>DTR : %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Déco : %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>En déco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>LND : %umin (calc) @@ -9731,111 +9784,111 @@ EADD : %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>LND : >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>DTR : %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>DTR : >2h (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT : %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Plafond calculé %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tissus %.0fmin : %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD dans le tissu directeur </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>rythme cardiaque %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>palier : %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Profondeur moyenne jusqu'à %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> - <translation>SAC : %.*f%s/min</translation> + <translation>%s SAC : %.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sPd:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sPd:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9884,142 +9937,142 @@ EADD : %d%s / %.1fg/ℓ <translation>O</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>Nitrox</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>plus de %1 jours</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n plongée(s))</numerusform><numerusform>(%n plongée(s))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXYGÈNE</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Impossible d'ouvrir le fichier %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Numéro</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Température de l'air</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Température de l'eau</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Plongées</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Voyages</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistiques</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Recherche avancée</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibilité</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Moniteur / Guide de palanquée</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Équipier</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Combinaison</translation> </message> @@ -10030,180 +10083,180 @@ EADD : %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Afficher plus de détails</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Année</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Durée totale</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Durée moyenne</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Durée la plus courte</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Durée la plus longue</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Profondeur moyenne</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Profondeur min.</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Prof. max.</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>SAC moy.</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>SAC min.</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>SAC max.</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temp. moyenne</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temp. min.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temp. max.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Retour à la liste</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Plongée n°</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Profil de plongée</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informations de plongée</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Équipement de plongée</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pression de service</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Pression de départ</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Pression finale</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Évènements</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valeur</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordonnées</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>État de plongée</translation> </message> @@ -10233,62 +10286,62 @@ EADD : %d%s / %.1fg/ℓ <translation>Tous (stats des voyages)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Janv.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Fév.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Avril</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Juin</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Juil.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Août</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sept.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Déc.</translation> </message> @@ -10539,12 +10592,17 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Prof. max :</translation> @@ -10570,77 +10628,77 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Notes :</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Construire</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Coulé</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>temps d'immerssion</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Raison</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationalité</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Longueur</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Sécheresse</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Déplacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Données d'épave</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Profondeur</translation> </message> @@ -10685,27 +10743,27 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Ville</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Début de la sauvegarde des données</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Début de la sauvegarde des plongées</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Cache local crée</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Préparation de la sauvegarde des données</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>modechange</translation> </message> @@ -10720,7 +10778,7 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Supprimer ce point</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Ne pas enregistrer un journal vide dans le cloud</translation> </message> @@ -10740,22 +10798,22 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Réponse invalide du serveur</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Le tag XML 'DiveDateReader' est attendu, '%1' a été obtenu à la place</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Le tag XML 'DiveDates' attendu n'a pas été trouvé</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Réponse XML mal formée. Ligne %1: %2</translation> </message> @@ -10768,112 +10826,102 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Subsurface mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Liste des plongées</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Gestion des plongées</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Désactiver la synchro auto vers le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Activer la synchro automatique vers le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Désactiver le service de localisation</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Paramètres</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Ajouter une plongée manuellement</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Télécharger depuis l'ordinateur de plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Synchro manuelle avec le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Désactiver la synchronisation automatique vers le cloud entraîne un enregistrement des données localement uniquement. Cela peut être utile dans des situations avec un accès au réseau limité ou inexistant. Veuillez choisir 'Synchro manuelle avec le cloud' si vous avez une connexion réseau et que vous souhaitez synchroniser vos données vers le stockage cloud.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Aide</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Envoyer les données GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Appliquer les points GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Télécharge les données de GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Afficher les points GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Vider le cache GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Développeur</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App log</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informations de thème</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Au sujet de</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Démarrer le service de localisation</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 09adec064..5e1f104cd 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -167,160 +167,160 @@ <translation>מחפש התקנים מרוחקים...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>סריקה הסתיימה בהצלחה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>התקן בלוטות' מקומי היה %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>פועל</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>כבוי</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>נותק</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>חובר</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>מורשה מחובר</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [מצב: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>ניתן להשתמש בהתקן %1. ניתן ללחוץ על כפתור "שמור".</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>התקן %1 צריך להיות מחובר על מנת להשתמש בו. אנא השתמש בתפריט ההקשר לאפשרויות החיבור.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>התקן דורש כתובת שאינה 0 על מנת להתחבר.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>ההתקן המקומי השתנה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>חבר</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>הסר חיבור</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>מנסה לחבר התקן %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>מנסה לנתק התקן %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>התקן %1 מנותק.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>התקן %1 מחובר.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>התקן %1 מחובר ומורשה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>אפשר להשתמש בהתקן %1 לחיבור. ניתן ללחוץ על כפתור שמור.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>תקלה בהתקן מקומי: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>שגיאת חיבור. אם ההתקן המרוחק דורש קוד PIN, אנא נסה לשייך את המכשירים על ידי שימוש במערכת ההפעלה שלך. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>תקלה לא מוכרת</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>מתאם בלוטות' כבוי, הפעל אותו לפני הפעלת סריקה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>כתיבה להתקן או קריאה ממנו הסתיימה בתקלה.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>תקלה לא מוכרת.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>תקלת גילוי מכשיר: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>לא זמין</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>לא ניתן לגשת למתאם בלוטות' המקומי.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>סוכן גילוי המכשירים לא נוצר מכיוון שהכתובת %1 אינה תואמת את כתובת המתאם הפיסית של אף אחד מהתקני בלוטות' המקומיים.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>אדם: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>חיפושים של בני זוג ודייבמאסטרים</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>אין בני זוג</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>שגיאה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>גיבוי הגדרות מחשב הצלילה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>קבצי גיבוי</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>תקלה בגיבוי XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>תקלה התרחשה בזמן שמירת קובץ גיבוי. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>גיבוי עבר בהצלחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>ההגדרות נשמרו ל: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>שחזר הגדרות של מחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>תקלה בשחזור XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>תקלה התרחשה בזמן שחזור קובץ גיבוי. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>שחזור עבר בהצלחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>ההגדרות שחזרו בהצלחה.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>בחר קובץ קושחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>כל הקבצים</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>קבצי לוג</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>מתחבר להתקן...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>מחובר להתקן</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>מנותק מהתקן</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>בחר קובץ להורדת log מחשב הצלילה</translation> </message> @@ -1972,22 +1972,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>פרטי צלילה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>מחיקת צלילה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>בטל שינוי</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>הצג על המפה</translation> </message> @@ -1995,104 +1995,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>צלילה מס' %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>תאריך:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>מיקום:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>קואורדינטות:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>השתמש במיקום GPS הנוכחי:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>עומק:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>משך הצלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>טמפ' האוויר:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>טמפ' מים:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>משקל:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>מיכל:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>תערובת גז:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>לחץ התחלתי:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>לחץ סופי:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>דירוג:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>ראות:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>הערות:</translation> </message> @@ -2261,104 +2293,119 @@ GPS הנוכחי:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>הצג הכל</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>הסתר הכל</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>הסתר אחרים</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>הסר צלילה/צלילות מטיול</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>צור טיול חדש למעלה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>הוסף צלילה/צלילות לטיול למעלה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>הוסף צלילה/צלילות לטיול למטה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>אגד את הטיול עם הטיול למעלה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>אגד את הטיול עם הטיול למטה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>מחיקת צלילה/צלילות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>סמן את הצלילות כלא תקינות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>אגד צלילות הנבחרות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>מספר צלילה/צלילות מחדש</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>הזחת זמן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>פצל צלילות נבחרות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>טען תמונה/תמונות מ-קובץ/קבצים</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>טען תמונה מאינטרנט</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>קבצי תמונה (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 אינו תמונה</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>קבצי תמונות</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>פתח קבצי תמונה</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>כל הקבצים</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 אינו תמונה</translation> </message> </context> <context> @@ -2559,7 +2606,7 @@ GPS הנוכחי:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>אור</translation> </message> @@ -2569,121 +2616,121 @@ GPS הנוכחי:</translation> <translation>חול</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>פורמט כללי המשמש לחילופי נתונים בין מגוון רחב של תוכנות הקשורות לצלילה .</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>ערכים מופרדים בפסיקים המתארים את פרופיל הצלילה.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>ערכים מופרדים בפסיקים המתארים את נתוני הצלילה. כולל את רוב פרטי הצלילה אך לא את פרטי פרופיל.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>שלח את נתוני צלילה לאתר divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>שלח את נתוני צלילה לאתר dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>יצוא מיקומי הצלילות, על מפת העולם בפורמט HTML.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>פורמט XML של Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>כתוב עומקי תמונות לקובץ.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>כתוב צלילה כפקודות מאקרו TeX לקובץ.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>יצוא קובץ UDDF כ-</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>קבצי UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>קבצי CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>קבצי HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>קבצי Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>קבצי TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>יצוא קובץ CSV כ-</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>יצוא מפת העולם</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>יצוא XML של Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>שמור עומק של תמונות</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>יצוא לקובץ TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>יצוא קובצי HTML כ-</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>אנא המתן, יצוא ...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>לא ניתן לפתוח קובץ %s</translation> </message> @@ -3043,62 +3090,62 @@ GPS הנוכחי:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>מיכל</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>עומק סופי</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>זמן צלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>גז שנוצל</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>נקודה קבועה למערכת סגורה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>מצב צלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>דקות</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>מטרים</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>זמני עצירה</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>טמפ</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>מיכל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>גז</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>רעילות שייורית מקסימלית</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>תגיות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>תמונות</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>מדינה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>בן זוג</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>עומק (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>מטרים</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>טמפ.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>משקל(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>ליברות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>צריכת גז (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>תמונות לפני / במהלך / אחרי צלילה</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>לא נבחרו צלילות</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>stylesheet לייצא ל-divelogs.de לא נמצא</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>נכשל ביצירת קובץ zip להעלאה: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>שגיאה פנימית</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>המרה של צלילה %1 לפורמט של divelogs.de נכשלה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>כישלון בכתיבת קובץ zip: %s שגיאת zip %d שגיאת מערכת%d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>סיים</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>העלאת רשימת צלילות...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>הורדת רשימת צלילות...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>הורדת %1 צלילות...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>ההורדה הסתיימה - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>תקלה בהורדה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>אין אפשרות לפתוח את הארכיב: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>הורדה פגומה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>אין אפשרות לפתוח את הארכיב: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>ההעלאה הסתיימה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>ההעלאה נכשלה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>ההעלאה הסתיימה בהצלחה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>שגיאת התחברות (הזדהות)</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>תשובה לא ברורה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>שגיאה: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>הורדה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>בחר מצב הורדה לבלוטות'</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>התחבר למחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>שגיאה</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>חפש מחשב צלילה Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>בטל הורדה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>בחר קובץ להורדת log מחשב הצלילה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>קבצי לוג</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>בחר קובץ לקובץ dump של divecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>קבצי Dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>נסה הורדה שוב</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>שמירת dump של libdivecomputer לא להוריד צלילות לרשימת הצלילה.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>הורדה</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>בטל</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth לא מופעל</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation> שם יצרן:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation> מחשב צלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation> חיבור:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>נסה שוב</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>סרוק שוב</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation> צלילות שהורדו</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>פרטים:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>אישור</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>בחר הכל</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>בטל בחירת הכל</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>מציין מיקום טקסט להתחבר לפייסבוק</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>כדי לנתק את Subsurface מחשבון הפייסבוק שלך, השתמש באפשרות 'Share' בתפריט.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>כדי להתחבר לפייסבוק, אנא בצע כניסה. זה מאפשר Subsurface לפרסם צלילות לציר הזמן שלך</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>כניסה לפייסבוק הצליחה</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>תקלה, שם משתמש לא מזוהה, אין יכולת להתחבר.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>הצלילה הועלתה בהצלחה לפייסבוק</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>טעינת הצלילה נכשלה. עיין בפלט הבאגים ושלח לרשימת התפוצה של Subsurface</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>בחר הכל</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>בטל בחירת הכל</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>הפוך בחירה</translation> </message> @@ -3932,18 +3996,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>מצא תמונות שהועברו</translation> + <source>Find moved media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>תמונות שנמצאו</translation> + <source>Found media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>מצא רק תמונות מצלילות שנבחרו</translation> + <source>Match only media files in selected dive(s)</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3958,8 +4022,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>פצל ספריות של תמונת</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3973,18 +4037,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>לא נמצאו תמונות מתאימות</translation> + <source>No matching media files found</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>נמצאו <b> %1 </b> תמונות במיקומן הנוכחי.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>נמצאו <b> %1 </b> תמונות במיקום החדש.</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>מיקום: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>מיקום</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (מיקום GPS זהה)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 מכאן</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n צלילה כאן)</numerusform><numerusform>, %n צלילה/ות כאן)</numerusform><numerusform>, %n צלילה/ות כאן)</numerusform><numerusform>, %n צלילות כאן)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(אין נתוני GPS קיימים, להוסיף תיקון GPS מצלילה זה)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(אין נתוני GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>בחר אתר: </translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>מיקום לא מוגדר</translation> </message> @@ -4242,8 +4306,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>הערות</translation> </message> @@ -4264,19 +4328,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>טמפ' האוויר</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>טמפ' המים</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -4357,8 +4421,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>תמונות</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ p, li { white-space: pre-wrap; } <translation>הוסף משקולות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>טמפ' האוויר [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>טמפ' המים [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>טיול זה בעריכה.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>צלילות מרובות בעריכה.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>צלילה זו בעריכה.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>הערות</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>מיקום</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>אתר צלילה חדש</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>בטל שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>אתה עומד לבטל את השינויים.</translation> </message> @@ -4470,424 +4534,419 @@ p, li { white-space: pre-wrap; } <translation>&ייבא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>עריכה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>שתף ב-</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>יומן &חדש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>חדש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&לפתוח יומן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>פתח</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&שמור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>שמור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>שמור בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>שמור בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&סגור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>סגור</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&הדפס</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>העדפות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&יציאה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>יבוא ממחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>יבא נתוני GPS משירות האינטרנט של Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>ערוך שמות של מכשירים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>הוסף צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>עריכת צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>העתק רכיבי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>הדבק רכיבי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&מספר מחדש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>קבץ אוטומטי</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>רשימת צלילות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>פרופיל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>פרטים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>הכל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>מחשב צלילה קודם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>מחשב צלילה הבא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>אודות Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>מדריך משתמש</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&מפה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>תכנן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>יבא קובץ יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>יבא קובץ יומן צלילה מתוכנה אחרת</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>יבוא מ- Divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>מסך מלא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>הפעל/כבה מסך מלא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>בדוק עדכונים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>יצוא</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>יצוא יומני צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>הגדרות מחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>עריכת צלילה במתכנן צלילות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>הצג/הסתר גרף pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>הצג/הסתר גרף pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>הצג/הסתר גרף pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>הצג/הסתר תקרה לפי מחשב צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>הצג/הסתר תקרה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>הפעל/כבה חישוב גזים ברקמות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>הפעל/כבה תקרה מחושבת עם מרווחים של 3 מטרים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>הצג/הסתר קצב לב</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>הצג/הסתר עומק מירבי</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>הצג/הסתר EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>הצג/הסתר NDL, זמן לפני המים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>הצג/הסתר סרגל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>שנה קנה מידה של הגרף</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>הצג/הסתר תמונות</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>הצג/הסתר גרף של גז</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>סנן רשימת צלילות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>הצג/הסתר מפת חום רקמות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>סקר משתמשים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>בטל שינוי</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>בצע שינוי שוב</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>חפש תמונות שהועברו</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>פתח אחסון בענן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>שמור לאחסון בענן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>ניהול אתרי צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>ערוך אתר צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>אחסון בענן במצב פעיל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>התחבר אל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>התנתק מ-</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>פתח קובץ</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>מנסה למזג צלילות עם מרווח של %1 דקות ביניהם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>נוצר גיבוי תבניות</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,214 +4969,214 @@ can overwrite them on startup.</source> יכול להחליף אותם בעת ההפעלה.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני חיבור לענן</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>יש לך שינויים שלא נשמרו. האם אתה רוצה לשמור אותם לאחסון ענן? אם לא, הענן יסונכרן רק בפעם הבאה שבוחרים "פתח אחסון ענן" או "שמור לאחסון ענן".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>חיבור לאחסון בענן נכשל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני הוספת צלילה.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>הדפס טבלת זמנים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>מנסה לערוך מחדש צלילה שאינה צלילה מתוכננת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>ראשית סיים את המהדורה הנוכחית לפני יצירת אחרת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>קבצי יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>קבצי Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>קבצי MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>תצוגה של קבצי APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>כל הקבצים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>האם ברצונך לשמור שינויים בקובץ %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>האם לשמור שינויים בקובץ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>שמור שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>שמור קובץ בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[עותק מקומי עבור] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[אחסון בענן ל-] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>פותח קובץ מגרסה ישנה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>אתה פתחת קובץ נתונים מגירסה ישנה יותר של Subsurface. אנו ממליצים לך לקרוא את המדריך כדי ללמוד על השינויים בגרסה החדשה, במיוחד על ניהול אתר צלילה שהשתנה רבות. Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כדאי לבחון את מערכת ניהול אתרי הצלילה החדשה ולוודא שהכל נראה תקין.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>פתח קובץ יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>מתחבר לאחסון בענן...</translation> </message> @@ -5174,7 +5233,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>סינון מציג %1 (מתוך %2) צלילות</translation> </message> @@ -5182,12 +5241,12 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>מומלץ לעדכן את הקושחה במחשב הצלילה: נמשה גרסה %1, אך הגרסה העדכני זה %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5196,27 +5255,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa אם המכשיר עושה שימוש בבלוטות', בצע את אותן ההכנות כמו עבור הורדת יומן לפני שתמשיך עם העדכון</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>לא עכשיו</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>עדכון קושחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>הודעת שדרוג קושחה</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>שמור את הקושחה שהורדת כ-</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>קבצי קושחה</translation> </message> @@ -5354,8 +5413,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>אין קובץ ברירת מחדל</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5379,6 +5438,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5409,29 +5469,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>מחק כל ההגדרות</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>אפס את כל ההגדרות לערך ברירת המחדל שלהן</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>כללי</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>פתח יומן ברירת מחדל</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>קבצי Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5586,8 +5671,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>עדכן גרסה מוקטנת של תמונות אם ישנה יותר מהתמונות</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5626,7 +5711,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>הצג עומק ממוצע בפרופיל</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>פרופיל</translation> </message> @@ -5705,27 +5790,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>אלו ישמשו כמות שהם. יתכן וזו אינה כוונתך. ראה http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>תווים ליטראלים</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>תו(ים) ללא משמעות בפורמט הזמן. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>תו(ים) ללא משמעות בפורמט התאריך. @@ -5777,7 +5862,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>אחסון בענן ל-Subsurface</translation> </message> @@ -5802,73 +5887,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>שמור סיסמה?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>שירות איטרנט של Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>זיהוי משתמש ברירות מחדל</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>שמור זיהוי משתמש מקומית?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>רשת</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>אין שרת פרוקסי</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>שרת פרוקסי של המערכת</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>שרת פרוקסי ל-HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>שרת SOCKS פרוקסי</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>מהתעלם מהשינוי. אימייל וסיסמת אחסון של ענן יכולים להיות מורכבים אותיות, מספרים ו- '', '-', '_' ו- '+' בלבד.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>מהתעלם מהשינוי. אימייל וסיסמת אחסון חדשים של ענן יכולים להיות מורכבים אותיות, מספרים ו- '', '-', '_' ו- '+' בלבד.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>דואר אלקטרוני וסיסמא לאחסון בענן יכולים רק מורכבים מאותיות, מספרים, ו, '.' '-', '_', ו '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>אחסון בענן ל-Subsurface (זיהוי מאומת)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>אחסון בענן של Subsurface (סיסמה לא תקינה)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>אחסון בענן של Subsurface (נדרש PIN)</translation> </message> @@ -6197,133 +6267,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 מתוך %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>מחשב צלילה לא מוכר</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>הצגת NDL / TTS הושבתה בגלל זמן עיבוד חריג</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>הוסף שינוי גז</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>בחר מחשב צלילה ראשונה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>צלילה מתוכננת</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>צלילה הוזן ידנית</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>מחק מחשב צלילה זה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (מיכל %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>הוסף שינוי נקודה קבועה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>הוספת סימנייה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>פצל צלילה לשתי צלילות</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>שינוי מצב צלילה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>ערוך פרופיל צלילה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>הסר את האירוע</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>הסתר אירועים דומים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>ערוך שם</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>שינוי לחץ במיכל %1 (כרגע מחושב כ-%2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>חשוף את כל האירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>הסתר אירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>הסתר את כל %1 האירועים?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>הסר את האירוע שנבחר?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>שינוי שם סימנייה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>שם חופשי:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>שם ארוך מדי!</translation> </message> @@ -6331,53 +6401,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>מתחיל...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>פתח קובץ יומן צלילה מקומי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>פתיחת קובץ יומן צלילה מקומי נכשלה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 צלילות נטענו מאחסון מקומי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>עובד במצב של חוסר תקשורת עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>שגיאה בקריאת קובץ מקומי, מוותר</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>אין פרטי זיהוי לחשבון ענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>נא להזין פרטי זיהוי חוקיים לחשבון ענן.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>דואר אלקטרוני וסיסמא לאחסון בענן יכולים מורכבים רק מאותיות, מספרים, '.' '-', '_', ו '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>פורמט דואר אלקטרוני לא חוקי</translation> </message> @@ -6427,50 +6497,50 @@ Please export this template to a different file.</source> <translation>אין אפשרות להתחבר לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>פרטי זיהוי לענן נכונים, טוען צלילות...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>שגיאת אחסון ענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>טוען צלילות מקובץ מקומי (מצב ללא אחסון בענן)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>שגיאה בחיבור לשרת ענן, חוזר למצב של עבודה מקומית</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>חיבור לענן נוצר בהצלחה. אין צלילות ברשימת הצלילות.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>שעות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>דקות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>שניות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>נ"צ לא מוכר</translation> </message> @@ -6478,7 +6548,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>מתחיל...</translation> </message> @@ -6570,116 +6640,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>הגדרות</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>לא מוגדר</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>שם משתמש או סיסמה לא נכונים</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>יש לאמת פרטי זיהוי</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>פרטי זיהוי מאומתים</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>ללא חיבור לענן</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>מצב חיבור לענן</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>דואר אלקטרוני</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>לא רלוונטי</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>שנה</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>סטטוס</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>סגנון</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>כחול</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>טקסט רגיל</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>סמן</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>ורוד</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>חשוך</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>שירות WEB של נתוני GPS של Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>סף מרחק (מטרים)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>סף זמן (דקות)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>מיכל:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>מפתח</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>הצג תפריט מפתחים</translation> </message> @@ -6714,16 +6794,14 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>אזהרה! -לא לכל התמונות יש זמן בטווח שבין -30 דקות לפני תחילת ו -30 דקות לאחר סיום כל צלילה שנבחרה.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>טעינת תמונות גם אם הזמן אינו תואם לזמן הצלילה</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6746,39 +6824,39 @@ Not all images have timestamps in the range between <translation>מהם התאריך והשעה המוצגים בתמונה?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>פתח קובץ תמונה</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>קבצי תמונות</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>תאריך/שעה של הצלילה שנבחרה</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>תאריך/שעה של הצלילה הראשונה שנבחרה</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>תאריך/שעה של הצלילה האחרונה שנבחרה</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> קבצים עם תאריך/שעה לא נכונים</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>לא נמצאו נתוני תאריך/שעה ב-Exif</translation> </message> @@ -6871,28 +6949,28 @@ Files with inappropriate date/time</source> <translation>הודעות מיבוא (שגיאות, אזהרות, וכו')</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>פתח קבצי SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>קבצי SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>כל הקבצים</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>קבצי Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>פתח קבצי Subsurface</translation> </message> @@ -6900,64 +6978,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>קטן</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>בינוני</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>תאריך צלילה: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>משך: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>שעות</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>דקות</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>אתר צלילה: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>בן זוג: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>דייבמאסטר: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7094,65 +7172,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>הזן את זיהוי משתמש ולחץ על הורדה</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>שירות אינטרנט</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>מתחבר...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>ההורדה הסתיימה</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>שגיאת הורדה: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>שגיאת חיבור: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>שם משתמש לא חוקי!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>תשובה לא מובנת!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>ההורדה הצליחה</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>חליפות: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>לא הוגדרה חליפה</translation> </message> @@ -7283,39 +7313,44 @@ Files with inappropriate date/time</source> <translation>רמת זום</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>טען תמונה/תמונות מ-קובץ/קבצים</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>טען תמונה/תמונות מהרשת</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>מחק תמונות נבחרות</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>מחק את כל התמונות</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>חשב מחדש גרסה מוקתנת של תמונות שנבחר</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>מחק תמונות</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>האם אתה באמת רוצה למחוק את כל התמונות?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7483,15 +7518,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>תגיות: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>תגיות</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>תגים ריקים</translation> </message> @@ -7690,7 +7725,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1 לחץ כדי להציג %2</translation> </message> @@ -7714,130 +7749,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 מוצג)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>עומק (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>מטרים</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>טמפ.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>מיכל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>רעילות שיורית מירבית</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>תגיות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>בן זוג</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>שעות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>דקות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>משקל(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>גז</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>צריכת גז (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>תמונות לפני / במהלך / אחרי צלילה</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>מדינה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -7851,81 +7891,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>הזן כתובת URL לתמונות</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>בדוק עדכונים.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface לא היה מסוגל לבדוק אם יש עדכונים.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>התקלה הבאה התרחשה:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>אנא בדוק את חיבור האינטרנט שלך.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>אתה משתמש בגרסה האחרונה של Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>גרסה חדשה של Subsurface זמינה.<br/>לחץ כאן:<br/><a href="%1">%1</a><br/> כדי להוריד.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>גרסה חדשה של Subsurface זמינה.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>הגרסה האחרונה היא %1, אנא בדוק %2 בדף ההורדה שלנו %3 למידע כיצד לעדכן.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>הגרסה האחרונה היא </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>השרת החזיר את המידע הבא:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface בודקת כל שבועיים אם זמינה גרסה חדשה. אם אתה לא רוצה ש-Subsurface תמשיך לבדוק, אנא לחץ על 'דחה'.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>דחה</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>אישור</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>בדיקת עדכונים אוטומטית</translation> </message> @@ -8101,6 +8141,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8156,12 +8209,12 @@ Language: %1</source> <translation>העלאה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>הפעולה נכשלה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>מעביר נתונים...</translation> </message> @@ -8187,8 +8240,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>אין תקלות</translation> </message> @@ -8312,7 +8365,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>שגיאה בניתוח הכותרת</translation> </message> @@ -8649,9 +8702,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>חמצן</translation> </message> @@ -8666,131 +8719,131 @@ Maximum</source> <translation>מערכת פתוחה</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>פסקל</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ליטר</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>מטרים לדקה</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>מטרים לשניה</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>רגל לדקה</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>רגל לשניה</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>אויר</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>משולב</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>חגורה</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>קרסול</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>פלטת גב</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>נצמד</translation> </message> @@ -8867,123 +8920,123 @@ Maximum</source> <translation>לא נמצא פרופיל צלילה מ- '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>שולף מתוך אחסון (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>מעביר מאחסון (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>מעביר לאחסון (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>ספריית מטמון %s מקומית פגומה - לא ניתן לסנכרן עם אחסון ענן </translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>לא ניתן לעדכן את המטמון המקומי לנתונים מרוחקים חדשים יותר</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>אחסון בענן של Subsurface פגום</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>לא ניתן לעדכן אחסון ענן של Subsurface, נסה שוב מאוחר יותר</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>אחסון מרוחק ונתונים מקומיים התפצלו. שגיאה: איחוד נכשל (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>אחסון מרוחק ונתונים מקומיים התפצלו. לא ניתן לשלב שינויים מקומיים ומרוחקים</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>נתונים אחסון מקומיים ומרוחק התפצלו</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>אחסון מרוחק ונתונים מקומיים התפצלו. שגיאה: כתיבת נתונים נכשלה (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>בעיות עם מטמון מקומי של נתוני ענן Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>נתונים מטמון מעבר ל-%s. אנא נסה שוב את הפעולה.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>עדכן קבצים מקומיים כדי להיות זהים לאחסון בענן</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>שומר שינוים מקומיים לאחסון בענן</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>מנסה למזג שינויים מקומיים באחסון בענן</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>שמור נתונים לאחסון בענן</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>לסנכרן עם איחסון בענן</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>לא ניתן להתחבר לשרת הענן, עובד עם נתונים מקומיים</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>מחובר לאחסון בענן, טוען מרחוק</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>סנכרון עם אחסון בענן הסתיים בהצלחה</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>שגיאה בחיבור לאחסון בענן של Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>שיבוט git של%s נכשל (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>מסנכרן קובץ נתונים</translation> </message> @@ -9082,119 +9135,119 @@ Maximum</source> <translation>מס' ארוע שגוי</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>שגיאה בקריאת תאריך</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>צלילה %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>שגיאה בקריאת זמן צלילה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>שגיאה בקריאת עומק מקסימלי</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>שגיאה בקריאת טמפרטורה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>שגיאה בקריאת תערובת גזים</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>שגיאה בקבלת מליחות מים</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>שגיאה בקבלת לחץ על פני המים</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>שגיאה בקבלת מצב צלילה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>שגיאה בקריאת תערובת הגזים</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>לא מצליח להבין %s %s </translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>שגיאה ברישום המידע</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>כבר הורד צלילה ב-%s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>מודל=%s קושחה=%u מספר סידורי=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>שגיאה בעת רישום שגרת הביטול.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>לא ניתן לייצר אובייקט של libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>שגיאה בפתיחה של% s% s (% s). ברוב המקרים, על מנת לדבג בעיה זו, כדאי לשלוח את קובצי לוג.ניתן להעתיק אותם ללוח בתיבת הדו-שיח אודות.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9203,13 +9256,13 @@ You can create this logfile by selecting the corresponding checkbox in the downl ניתן ליצור קובץ logfile זה על-ידי בחירה בתיבת הסימון המתאימה בתיבת הדו-שיח להורדה.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>אין צלילות חדשות שהורדו מהמחשב לצלול</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>מיקומי GPS מרובים לאתר צלילה זה; גם %s @@ -9217,19 +9270,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>שם נוסף לאתר: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>טען צלילות מקובץ מקומי</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>פתיחת נתוני צלילה עברה בהצלחה</translation> </message> @@ -9252,12 +9305,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>נכשל ניסיון לנתח '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> @@ -9288,8 +9341,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, GF אפקטיבי=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>שינוי SP</translation> </message> @@ -9552,17 +9605,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>pO₂ נמוך %.2f ב- %d:%02u עם גז %s בעומק %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>לא ניתן למצוא את הגז %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9571,84 +9624,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>צריכת גז: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>רעילות שייורית מקסימלית %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2f בר </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2f בר </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2f בר </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>דקו: %u דקות @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>חנת בטיחות: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9657,7 +9710,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9666,175 +9719,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>צפיפות: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>תחנת בטיחות: זמן לא ידוע @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>דקו: זמן לא ידוע @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>בדקו </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %u דקות </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %u דקות </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>דקו: %u דקות @ %.0f%s (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>בדקו (חישוב) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %u דקות (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: > שעתיים (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %u דקות (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: > שעתיים (מחושב) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %u דקות </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>תקרה %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>רקמה %.0f דקות: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD ברקמה העמוסה </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>קצב לב: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>כיוון: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>עומק ממוצע לכאן %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dדקות</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/דקה</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9883,142 +9936,142 @@ EADD: %d%s / %.1fg/ℓ <translation>מע</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>אוויר</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>יותר מ-%1 ימים</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n צלילה)</numerusform><numerusform>(%n צליל(ה/ות))</numerusform><numerusform>(%n צליל(ה/ות))</numerusform><numerusform>(%n צלילות)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>חמצן</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>לא ניתן לפתוח קובץ %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>מספר</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>זמן</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>טמפ' האוויר</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>טמפ' המים</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>צלילות</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>הצג הכל</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>הסתר הכל</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>טיולים</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>סטטיסטיקות</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>חיפוש מתקדם</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>ראות</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>דייבמאסטר</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>בן זוג</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>חליפה</translation> </message> @@ -10029,180 +10082,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>תגיות</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>הערות</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>הצג יותר נתונים</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>שנה</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>סה"כ זמן</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>זמן ממוצע</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>זמן מינימלי</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>זמן מקסימלי</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>עומק ממוצע</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>עומק מינימלי</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>עומק מירבי</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>צריכת גז ממוצע</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>צריכת גז מינימלית</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>צריכת גז מירבית</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>טמפרטורה ממוצעת</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>טמפ' מינימלי</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>טמפ' מקסימלית</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>חזרה לרשימה</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>צלילה מס'</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>פרופיל צלילה</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>פרטי צלילה</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>ציוד צלילה</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>סוג</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>גודל</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>לחץ מקסימלי</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>לחץ התחלתי</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>לחץ סופי</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>גז</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>אירועים</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>שם</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>ערך</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>קואורדינטות</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>סטטוס צלילה</translation> </message> @@ -10232,62 +10285,62 @@ EADD: %d%s / %.1fg/ℓ <translation>הכל (לפי נתוני טיולים)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>ינואר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>פבואר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>מרץ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>אפריל</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>מאי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>יוני</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>יולי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>אוגוסט</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>ספטמבר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>אוקטובר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>נובמבר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>דצמבר</translation> </message> @@ -10538,12 +10591,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>שניות</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>עומק מירבי:</translation> @@ -10569,77 +10627,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>הערות:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>בניה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>טיבוע</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>זמן טיבוע</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>סיבה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>לאום</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>מספנה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>סוג של ספינה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>אורך</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>רוחב</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>שוקע</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>תפוסה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>מטען</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>נתוני ספינה טרופה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>גובה</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>עומק</translation> </message> @@ -10684,27 +10742,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>עיר</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>התחל לשמור נתונים</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>התחל לשמור צלילות</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>יצירת מטמון מקומי בוצע</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>מתכונן לשמור נתונים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>שינוי מצב</translation> </message> @@ -10719,7 +10777,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>הסר נקודה זו</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>לא לשמור יומן ריק לענן</translation> </message> @@ -10739,22 +10797,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>מקסימום</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>תגובה לא חוקית מהשרת</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>תג XML צפוי 'DiveDateReader', נמצא %1 במקומו.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>תג XML צפוי 'DiveDates' לא נמצא</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>תגובת XML פגומה. שורה %1: %2</translation> </message> @@ -10767,112 +10825,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>רשימת צלילות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>ניהול צלילות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>בטל סנכרון ענן אוטומטי</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>אפשר סנכרון ענן אוטומטי</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>בטל שירות מיקום</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>הגדרות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>הוסף צלילה ידנית</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>משוך נתונים ממחשב צלילה</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>לסנכרן באופן ידני עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>כיבוי אוטומטי של סנכרון לענן גורם לאחסון נתונים רק באופן מקומי. זה יכול להיות שימושי מאוד במצבים עם גישה מוגבלת או ללא רשת. בחר 'סינכרון ידני עם ענן' אם יש לך קישוריות לרשת וברצונך לסנכרן את הנתונים שלך עם אחסון בענן.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>עזרה</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>העלה נתוני GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>הפעל תיקוני GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>הורד נתוני GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>הצג נ"צ שמורים</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>מחק מטמון נתוני GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>מפתח</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>אירועי תוכנה</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>פרטי אפיון</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>אודות</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>הפעל שירות מיקום</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 745f4d2e2..c2da6f99d 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1658,100 +1658,100 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Greška</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1966,22 +1966,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Obriši uron</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1989,103 +1989,135 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Dubina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Težina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2254,103 +2286,118 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Kreiraj novu grupu iznad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Spoji s grupom iznad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Spoji s grupom ispod</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> </context> @@ -2552,7 +2599,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation type="unfinished"/> </message> @@ -2562,121 +2609,121 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -3036,62 +3083,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3292,259 +3339,265 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3552,23 +3605,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Greška</translation> </message> @@ -3578,42 +3631,47 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> @@ -3685,9 +3743,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3713,7 +3771,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3728,57 +3786,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Pokušaj ponovo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Izlaz</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3809,12 +3873,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3822,22 +3886,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3853,17 +3917,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3918,17 +3982,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3944,7 +4008,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3959,17 +4023,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4062,40 +4126,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Lokacija</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4103,7 +4167,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4227,8 +4291,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Bilješke</translation> </message> @@ -4249,19 +4313,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -4342,7 +4406,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> + <source>Media</source> <translation type="unfinished"/> </message> <message> @@ -4376,53 +4440,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4455,424 +4519,419 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Novi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Spremi kao</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Zatvori</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4886,212 +4945,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5147,7 +5206,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5155,39 +5214,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5325,7 +5384,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5350,6 +5409,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation type="unfinished"/> </message> @@ -5380,29 +5440,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5557,7 +5642,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5597,7 +5682,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5676,25 +5761,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5745,7 +5830,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5770,73 +5855,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6164,133 +6234,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6298,53 +6368,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6394,50 +6464,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6445,7 +6515,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6537,116 +6607,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6681,13 +6761,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6711,38 +6791,38 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6835,28 +6915,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6864,59 +6944,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7052,65 +7132,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Web servis</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Spajanje...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Neispravna korisnička oznaka</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Ne mogu obraditi odziv</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7241,38 +7273,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7439,15 +7476,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> <translation type="unfinished"/> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7646,7 +7683,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7670,130 +7707,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -7807,80 +7849,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8052,6 +8094,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8107,12 +8162,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8138,8 +8193,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8253,7 +8308,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8589,9 +8644,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8606,131 +8661,131 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>zrak</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrirani</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>pojas</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>gležanj</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8807,123 +8862,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9022,149 +9077,149 @@ Maximum</source> <translation>neispravan broj događaja</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Greška pri parsiranju datuma i vremena</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Greška pri parsiranju vremena urona</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Greška pri parsiranju maksimalne dubine</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Greška pri parsiranju broja mješavina</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Greška pri dohvaćanju saliniteta vode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Ne mogu kreirati parser za %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9187,12 +9242,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -9223,8 +9278,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9486,252 +9541,252 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> @@ -9780,142 +9835,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Zrak</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Uroni</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistika</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Vidljivost</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Voditelj</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Odijelo</translation> </message> @@ -9926,180 +9981,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Godina</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Vrsta</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Veličina</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10129,62 +10184,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Pro</translation> </message> @@ -10430,12 +10485,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10461,77 +10521,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Dubina</translation> </message> @@ -10576,27 +10636,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10611,7 +10671,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10631,22 +10691,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Max.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -10659,112 +10719,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Pomoć</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index ca42e041c..1a38f674d 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -167,161 +167,161 @@ <translation>Távoli eszközök keresése...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Keresés sikeresen befejeződött</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>A helyi bluetooth eszköz %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>bekapcsolva</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>kikapcsolva</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>NEM PÁROSÍTOTT</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PÁROSÍTOTT</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>ENGEDÉLYEZETT_PÁROSÍTOTT</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Állapot: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Az 1% eszköz készen áll a kapcsolatra. Nyomd meg a mentés gombot.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>A helyi eszköz megváltozott.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Párosítás</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Párosítás megszüntetése</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>1% eszköz párosítása</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>1% eszköz párosításának megszüntetése</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Az 1% eszköz párosítása megszüntetve.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Az 1% eszköz párosítva.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Az 1% eszköz párosítva és engedélyezve.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Az 1% eszköz készen áll a kapcsolatra. Nyomd meg a mentés gombot.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Helyi eszköz hiba: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Ismeretlen hiba</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Egy ismeretlen híba létett fel.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Nem elérhető</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>A helyi bluetooth adapter nem elérhető.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -329,12 +329,12 @@ Nyomd meg a mentés gombot.</translation> <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Személy:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Merülőtárs és merülés vezető keresése</translation> </message> @@ -342,7 +342,7 @@ Nyomd meg a mentés gombot.</translation> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Nincs merülőtárs</translation> </message> @@ -1663,100 +1663,100 @@ Nyomd meg a mentés gombot.</translation> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Búvárkomputer beállításainak biztonsági mentése</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Fájlok biztonsági mentése</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML biztonsági mentés hiba</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Egy hiba lépett fel a fájl biztonági mentésése közben. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Biztonsági mentés sikeres</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>A beállításaid mentve lettek: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Helyreállítani a buvárkomputer beállításat</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML helyreállítási hiba</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Egy hiba lépett fel a biztonági mentésése helyreállítása közben. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Helyreállítás sikeres</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>A beállításaid helyreállítása sikeres.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Firmware fájl kiválasztása</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Összes fájl</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Napló fájlok</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Csatlakozás az eszközhöz ...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Csatlakoztatva az eszközhöz</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Leválasztva az eszközről</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1971,22 +1971,22 @@ Nyomd meg a mentés gombot.</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Merülés részletei</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Merülés törélse</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Szerkesztés visszavonása</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Mutasd a térképen</translation> </message> @@ -1994,103 +1994,135 @@ Nyomd meg a mentés gombot.</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Merülés %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Dátum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Elhelyezkedés:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordináták:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Használd az aktuális GPS elhelyezkedést:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Mélység:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Időtartam:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Levegő hőm.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Víz hőm.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Ruha:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Merülőtárs:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Merülés vezető:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Súly:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Palack:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gázkeverék:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Induló nyomás:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Végső nyomás:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Értékelés:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Láthatóság:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Jegyzetek:</translation> </message> @@ -2259,104 +2291,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Továbbiak összecsukása</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Merülés(ek) eltávolítása az túrából</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Túra létrehozása fentebb</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Merülés(ek) hozzáadása a túrához azonnal fölé</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Merülés(ek) hozzáadása a túrához azonnal alá</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Túra egyesítése a fentivel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Túra egyesítése a lentivel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Merülés(ek) törlése</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Egysiteni a kiválasztott merüléseket</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Újraszámozni a merülés(t/eket)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Felosztani a kiválasztott merüléseket</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Kép(ek) betöltése fájlból</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Kép betöltése webről</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Kép fájlok (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Képfájl megnyitása</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Összes fájl</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2557,7 +2604,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Fény</translation> </message> @@ -2567,121 +2614,121 @@ GPS location:</source> <translation>Homok</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface nativ XML formátum</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF fájlok</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV fájlok</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML fájlok</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface fájlok</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX fájlok</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Világtérkép exportálása</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Subsurface XML exportálása</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exportálás TeX fájlba</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Kérlek várj, exportálás ...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>A %s fájlt nem lehet megnyitni</translation> </message> @@ -3041,62 +3088,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>ismeretlen</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>pal.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Végső mélység</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Merülési mód</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>perc</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3297,259 +3344,265 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Értékelés</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Súly</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Ruha</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Hőm.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Palack</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gáz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Címkék</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotók</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Ország</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Merülőtárs</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3557,23 +3610,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Hiba</translation> </message> @@ -3583,42 +3636,47 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Napló fájlok</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> @@ -3690,9 +3748,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3718,7 +3776,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Mégse</translation> </message> @@ -3733,57 +3791,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Kilépés</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Elfogad</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3814,12 +3878,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3827,22 +3891,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3858,17 +3922,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3923,17 +3987,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3949,7 +4013,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3964,17 +4028,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4067,40 +4131,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Hely</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4108,7 +4172,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4232,8 +4296,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Jegyzetek</translation> </message> @@ -4254,19 +4318,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Levegő hőm.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Víz hőm.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Hely</translation> </message> @@ -4347,8 +4411,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotók</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4381,53 +4445,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4460,424 +4524,419 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Új</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Ment</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Bezárás</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Bezárás</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Mégse</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4891,212 +4950,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface fájlok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Összes fájl</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5152,7 +5211,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5160,39 +5219,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Firmware frissítése</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5330,7 +5389,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5355,6 +5414,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5385,29 +5445,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface fájlok</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5562,7 +5647,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5602,7 +5687,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation type="unfinished"/> </message> @@ -5681,25 +5766,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5750,7 +5835,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5775,73 +5860,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6169,133 +6239,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6303,53 +6373,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6399,50 +6469,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>ó</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>perc</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6450,7 +6520,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6542,116 +6612,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Beállítások</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Nem felhő mód</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Téma</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Kék</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Palack:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6686,13 +6766,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6716,38 +6796,38 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6840,28 +6920,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Összes fájl</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface fájlok</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6869,59 +6949,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Közepes</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ó</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>perc</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7057,65 +7137,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Csatlakozás...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Érvénytelen felhasználó azonosító</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Nem lehet feldolgozni választ!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7246,38 +7278,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Kép(ek) betöltése fájlból</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7444,15 +7481,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Címkék</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7651,7 +7688,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7675,130 +7712,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Értékelés</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Palack</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Címkék</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Merülőtárs</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>ó</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>perc</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Ruha</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gáz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Ország</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Hely</translation> </message> @@ -7812,80 +7854,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Elfogad</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8057,6 +8099,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8112,12 +8167,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8143,8 +8198,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8258,7 +8313,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8594,9 +8649,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8611,131 +8666,131 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation type="unfinished"/> </message> @@ -8812,123 +8867,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9027,149 +9082,149 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Hiba a dátumidő feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Hiba a merülési idő feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Hiba a max mélység feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Hiba gáz keverék számítás feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Hiba a víz sótartalmának lekérdezésekor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Hiba a gáz keverék feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Esemény: várakozás a felhasználóra</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Hiba az esemény kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9191,12 +9246,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>'%s' értelmezése meghiúsult.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -9227,8 +9282,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9490,252 +9545,252 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> @@ -9784,142 +9839,142 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>LÉG</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>A %s fájlt nem lehet megnyitni</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Levegő hőm.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Víz hőm.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Merülések</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Értékelés</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Láthatóság</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Merülés vezető</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Társ</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Ruha</translation> </message> @@ -9930,180 +9985,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Címkék</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Jegyzetek</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max. mélység</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Merülés #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Típus</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Méret</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Kezdő nyomás</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Végső nyomás</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gáz</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Súly</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10133,62 +10188,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Már</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Ápr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jún</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Júl</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10434,12 +10489,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10465,77 +10525,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Jegyzetek:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Hossz</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Mélység</translation> </message> @@ -10580,27 +10640,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10615,7 +10675,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10635,22 +10695,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -10663,112 +10723,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Merülés lista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Beállítások</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Segítség</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Névjegy</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index ba6b0f483..0e664f85a 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Personil:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Cari teman dan divemaster</translation> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Tidak ada teman</translation> </message> @@ -1658,100 +1658,100 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Kesalahan</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1966,22 +1966,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1989,103 +1989,135 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2254,103 +2286,118 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> </context> @@ -2552,7 +2599,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation type="unfinished"/> </message> @@ -2562,121 +2609,121 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -3036,62 +3083,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3292,259 +3339,265 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Tag</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Rekan</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3552,23 +3605,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Kesalahan</translation> </message> @@ -3578,42 +3631,47 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> @@ -3685,9 +3743,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3713,7 +3771,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Batal</translation> </message> @@ -3728,57 +3786,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3809,12 +3873,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3822,22 +3886,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3853,17 +3917,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3918,17 +3982,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3944,7 +4008,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3959,17 +4023,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4062,40 +4126,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Lokasi</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4103,7 +4167,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4227,8 +4291,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Catatan</translation> </message> @@ -4249,19 +4313,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temperatur Udara</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temperatur air</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -4342,7 +4406,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> + <source>Media</source> <translation type="unfinished"/> </message> <message> @@ -4376,53 +4440,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4455,424 +4519,419 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Baru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Buka</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Simpan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Simpan sebagai</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Tutup</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4886,212 +4945,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5147,7 +5206,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5155,39 +5214,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>pemutakhiran peranti tegar</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5325,7 +5384,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5350,6 +5409,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5380,29 +5440,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5557,7 +5642,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5597,7 +5682,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation type="unfinished"/> </message> @@ -5676,25 +5761,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5745,7 +5830,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5770,73 +5855,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6164,133 +6234,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6298,53 +6368,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6394,50 +6464,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6445,7 +6515,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6537,116 +6607,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6681,13 +6761,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6711,38 +6791,38 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6835,28 +6915,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6864,59 +6944,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>menit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7052,65 +7132,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>identifikasi pengguna tidak cocok!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Respon gagal di telaah!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7241,38 +7273,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7439,15 +7476,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Tag</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7646,7 +7683,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7670,130 +7707,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Tag</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Rekan</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -7807,80 +7849,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8052,6 +8094,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8107,12 +8162,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8138,8 +8193,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8261,7 +8316,7 @@ Rata-rata</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8597,9 +8652,9 @@ Rata-rata</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8614,131 +8669,131 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>udara</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>terintegrasi</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>sabuk</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>Pergelangan kaki</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8815,123 +8870,123 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9030,149 +9085,149 @@ Rata-rata</translation> <translation>nomor kejadian tidak sesuai</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Gagal mengurai tanggal</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Gagal mengurai waktu selam</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Gagal mengurai kedalamn maks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Gagal mengurai perhitungan campuran gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>tidak dapat membuat pengurai untuk %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9194,12 +9249,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -9230,8 +9285,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9493,252 +9548,252 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> @@ -9787,142 +9842,142 @@ EADD: %d%s / %.1fg/ℓ <translation>B</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>UDARA</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>I</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Waktu</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temperatur Udara</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temperatur air</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Selam</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Jarak Lihat</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Rekan</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Pakaian</translation> </message> @@ -9933,180 +9988,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Tag</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Kedalaman Maks.</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Selam#</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tipe</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Ukuran</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Tekanan awal</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Tekanan akhir</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinat</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10136,62 +10191,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation type="unfinished"/> </message> @@ -10437,12 +10492,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10468,77 +10528,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>edalaman</translation> </message> @@ -10583,27 +10643,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10618,7 +10678,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10638,22 +10698,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maksimal</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -10666,112 +10726,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 8ccdbf619..1b257a52a 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -167,160 +167,160 @@ <translation>Scansione dei dispositivi remoti...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Scansione finita correttamente.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Il dispositivo locale Bluetooth era %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>acceso</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>spento</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>DISACCOPPIATO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>ACCOPPIATO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Stato: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Il dispositivo %1 può essere usato per la connessione. Premere il tasto salva.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Il dispositivo %1 deve essere accoppiato prima di poter essere usato. Usare il menù contestuale per le opzioni.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Uno strumento ha bisogno di un indirizzo per la connessione.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Il dispositivo locale è stato cambiato.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Accoppiamento</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Rimuovi accoppiamento</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Tentativo di accoppiamento dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Tentativo disaccoppiamento dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Dispositivo %1 era disaccoppiato</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Dispositivo %1 era accoppiato.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Dispositivo %1 è stato accoppiato e autorizzato.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Il dispositivo %1 può essere usato per la connessione. Premere il tasto salva.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Errore dispositivo locale: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Errore di accoppiamento. Se il dispositivo remoto richiede un PIN personalizzato, prova ad accoppiare il dispositivo usando il tuo sistema operativo.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Errore sconosciuto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>L'adattatore Bluetooth è spento, accendilo prima di avviare la ricerca.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>La scrittura o lettura dal dispositivo hanno causato un errore.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Si è verificato un errore sconosciuto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Errore nella ricerca di dispositivi: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Non disponibile</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Accesso negato all'adattatore Bluetooth locale.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>La ricerca di dispositivi non è stata avviata perché l'indirizzo %1 non coincide con l'indirizzo fisico di alcun dispositivo Bluetooth locale</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Persona:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Ricerca compagni di immersione e Divemaster</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Nessun compagno di immersione</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Backup delle impostazioni del computer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>File di backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Errore backup XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Si è verificato un errore nel salvataggio del file di backup. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup eseguito con successo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Le tue impostazioni sono state salvate in: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Ripristina le impostazioni del computer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Errore ripristino XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Si è verificato un errore nel ripristino del file di backup. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Ripristino avvenuto con successo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Le tue impostazioni sono state ripristinate correttamente.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Seleziona il file del firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Tutti i file</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>File di log</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Connessione al dispositivo...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Dispositivo connesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Dispositivo disconnesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Scegli il file per scaricare il log dal computer subacqueo</translation> </message> @@ -1973,22 +1973,22 @@ il computer selezionato?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Dettagli di immersione</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Cancella immersione</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Annulla modifiche</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Mostra nella mappa</translation> </message> @@ -1996,104 +1996,136 @@ il computer selezionato?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Immersione %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Luogo:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordinate</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Usa la posizione del GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Profondità:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Durata:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temp. aria:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temp. acqua:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Bombola:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Pressione iniziale:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Pressione finale:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibilità:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Note:</translation> </message> @@ -2262,104 +2294,119 @@ del GPS:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Espandi tutto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Minimizza tutto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Collassa altri</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Rimuove immersione(i) dal viaggio</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Crea un nuovo viaggio sopra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Aggiungi l'immersione(i) al viaggio subito sopra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Aggiungi l'immersione(i) al viaggio subito sotto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Raggruppa il viaggio con il viaggio sopra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Raggruppa il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Cancella immersione(i)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marca l'immersione(i) come non valide</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Fondi le immersioni selezionate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Rinumera le immersioni</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Sposta i tempi di immersione</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Dividi le immersioni selezionate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Carica immagine(i) da file(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Carica immagine dal web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>file di immagine (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 non sembra essere una immagine</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>File immagini</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Apri files di immagine</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Tutti i file</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 non sembra essere una immagine</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ del GPS:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Luce</translation> </message> @@ -2570,121 +2617,121 @@ del GPS:</translation> <translation>Sabbia</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Formato generico usato per lo scambio di informazioni tra diverse applicazioni in campo subacqueo.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valori separati da virgola che descrivono il profilo di immersione</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valori separati da virgole che includono la maggior parte delle informazioni di immersione ma non include il profilo di immersione.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Invia i dati di immersione al sito divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Manda i dati dell'immersione al sito dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Esportazione HTML dei luoghi di immersione, visualizzati su un mappamondo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Formato XML nativo di Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Esporta la profondità a cui sono state scattate le foto.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Salva immersione su file come TeX macros</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Esporta file UDDF come</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>File UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>File CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>File HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>File TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Esporta file CSV come</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Esporta il mappamondo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Esporta Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Salva la profondità a cui sono state scattate le foto</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Esporta in TeX file</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Esporta file HTML come</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Prego attendere, esportazione in corso...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Non posso aprire il file %s</translation> </message> @@ -3044,62 +3091,62 @@ del GPS:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>bombola</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Profondità finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Run Time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gas utilizzato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Modalità immersione</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Tempi di sosta</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Foto</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Nazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Compagno</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fot pprima/durante/dopo l'immersione</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>nessuna immersione è selezionata</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Non ho trovato il foglio di stile da esportare su divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>Creazione del file zip per il caricamento fallita: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>errore interno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>La conversione dell'immersione %1 al formato di divelogs.de è fallita</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>errore nella scrittura del file zip: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Fatto</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Sto caricando la lista immersioni...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Sto scaricando la lista immersioni...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Sto scaricando %1 immersioni...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Scaricamento finito - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problemi con il download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>L'archivio non può essere aperto: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Scaricamento corrotto</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>L'archivio non può essere aperto: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Caricamento finito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Caricamento fallito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Caricamento eseguito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Accesso fallito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Non riesco ad analizzare la risposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Scegli la modalità di download per il Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Connessione allo strumento in corso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Errore</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Cerca computer Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Annulla il download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Scegli il file per scaricare il log dal computer subacqueo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>File di log</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Scegli il file di dump per il computer subacqueo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>File Dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Riprova il download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Il salvataggio del dump di libdivecomputer NON inserirà le immersioni nella lista delle immersioni.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Download</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Il Bluetooth non è abilitato</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Marca:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Connessione:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Riprova</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Riscansiona</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Immersioni scaricate</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Seleziona tutto</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Deseleziona tutto</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Connetti ad un segnaposto testuale Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Per disconnettere Subsurface dal tuo account Facebook, usa la voce di menu 'Condividi'</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Per connetterti a Facebook, per favere inserisci le tue credenziali. Questo permette a Subsurface di pubblicare le immersioni sulla tua bacheca</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Accesso a facebook eseguito con successo</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Login fallito, utente sconosciuto</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Immersioni caricate correttamente su Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Caricamento delle immersioni fallito. Invia le informazioni di debug alla mailing list di Subsurface</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Seleziona tutto</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Deseleziona tutto</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inverti la selezione</translation> </message> @@ -3932,18 +3996,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Trova immagini spostate</translation> + <source>Find moved media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Immagini trovate</translation> + <source>Found media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Associa solo le immagini nelle immersioni selezionate</translation> + <source>Match only media files in selected dive(s)</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3958,8 +4022,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Visita le cartelle delle immagini</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3973,18 +4037,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>Non sono state trovate immagini corrispondenti</translation> + <source>No matching media files found</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>Sono state trovate <b>%1</b> immagini al loro posto.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>Sono state trovate <b>%1</b> immagini nelle nuove posizioni:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Luogo:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Luogo</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (stessi punti GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 lontano</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n immersione(i) qui)</numerusform><numerusform>, %n immersione(i) qui)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(non esistono punti GPS, li aggiungo da questa immersione)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(no dati GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Scegli il sito: </translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Nessun luogo impostato</translation> </message> @@ -4242,8 +4306,8 @@ Sei sicuro di voler continuare?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Note</translation> </message> @@ -4264,19 +4328,19 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temperatura atmosferica</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temperatura dell'acqua</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -4357,8 +4421,8 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Foto</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ Sei sicuro di voler continuare?</translation> <translation>Aggiungi la tipologia della pesata</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temp. aria [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temp. acqua [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Questo viaggio è stato editato.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Si stanno modificando immersioni multiple.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Si sta modificando questa immersione </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Note di viaggio</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Luogo del viaggio</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nuovo sito d'immersione</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Elimino le modifiche?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Stai per cancellare le modifiche.</translation> </message> @@ -4470,424 +4534,419 @@ Sei sicuro di voler continuare?</translation> <translation>&Importa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Modifica</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Condividi su</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Nuovo logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nuovo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Apri logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Salva</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Sal&va come</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Salva come</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Chiudi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Chiudi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Stampa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&referenze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Esci</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importa &dal computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importa dati &GPS dal web service Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Modifica &nomi del dispositivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Aggiungi immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Modifica immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copia dettagli immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Incolla dettagli immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Rinumera</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Raggruppamento Automatico</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Statistiche Annuali</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Lista immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profilo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Tutti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Computer precedente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Prossimo computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Informazioni su &Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manuale utente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Mappa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Pianifica immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importa logbook da file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importa log delle immersioni da altra applicazioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importa da Divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Tutto Schermo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Abilita Modalità Tutto Schermo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Controlla aggiornamenti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Esporta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Esporta il libretto di immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configura &Computer subacqueo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Modifica &immersione nel pianificatore</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Visualizza il grafico della pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Visualizza il grafico della pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Visualizza il grafico pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Visualizza il ceiling calcolato dal computer subacqueo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Visualizza il ceiling calcolato</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Attiva/disattiva il calcolo su tutti i tessuti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Visualizza il ceiling calcolato con incrementi di 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Visualizza il battito cardiaco</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Visualizza la MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Visualizza EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Visualizza NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Visualizza il CAS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Visualizza il righello</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Scala grafico</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Visualizza immagini</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Mostra la barra dei gas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtra la lista delle immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Visualizza il grafico della saturazione dei tessuti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>&Sondaggio</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Annulla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Ripeti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Trova immagini spostate</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Apri memoria c&loud </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Salva nella memoria clo&ud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Gestisti i siti di immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Modifica il sito di immersione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Cloud connesso</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Connetti a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Disconnetti da</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di aprire un nuovo file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Apri file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Sto cercando di unire delle immmersioni con un intervallo di %1min tra di loro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Backup del modello creato</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,214 +4969,214 @@ sono protetti in sola lettura e non dovrebbero essere modificati direttamente da li può sovrascrivere alla partenza.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Salva o cancella le modifiche all'immersione corrente prima di connetterti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Ci sono modifiche non salvate. Vuoi salvarle nel Cloud? In caso negativo, il Cloud verrá sincronizzato solo alla prossima operazione di "Connessione al Cloud" or "Salva nel Cloud".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Errore nella connessione con il Cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di chiudere il file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di aggiungerne un'altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Statistiche Annuali</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>File di log delle immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>File MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Tutti i file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vuoi salvare le modifiche fatte nel file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Le modifiche saranno perse se tu non le salvi.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[cache locale for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[memoria cloud per] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Apertura di un file di dati da una vecchia versione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Hai aperto un file di dati da una vecchia versione di Subsurface. Ti consigliamo di leggere il manuale per approfondire le modifiche apportate alla nuova versione, con particolare riguardo alla gestione dei siti di immersione che è cambiata in modo significativo. Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe il caso di dare un'occhiata alla gestione dei siti di immersione per controllare che tutto sia a posto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Sto contattando il servizio cloud...</translation> </message> @@ -5174,7 +5233,7 @@ Potrebbero mancare i moduli QML QtPositioning e QtLocation!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>I Filtri mostrano %1 (di %2) immersioni</translation> </message> @@ -5182,12 +5241,12 @@ Potrebbero mancare i moduli QML QtPositioning e QtLocation!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Dovresti aggiornare il firmware sul tuo computer: hai la versione %1 ma la versione stabile più recente è %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5196,27 +5255,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, esegui le stesse operazioni che fai per scaricare il logbook</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Non adesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Aggiorna il firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Avviso di aggiornamento del firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Salva il firmware scaricato come</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>File del firmware</translation> </message> @@ -5354,8 +5413,8 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>nessun file di default</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5379,6 +5438,7 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5409,29 +5469,54 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Cancella tutte le impostazioni</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Riporta tutte le impostazioni ai valori iniziali</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Generali</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Apri il log delle immersioni di default</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5586,8 +5671,8 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Rigenera le miniature se sono più vecchie delle immagini</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5626,7 +5711,7 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <translation>Mostra la profondità media nel Profilo</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profilo</translation> </message> @@ -5705,27 +5790,27 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <translation>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Questi saranno usati letteralmente ma forse non è esattamente quello che volevi. Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caratteri Literal</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Carattere(i) non speciali nel formato dell'ora </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Carattere(i) non speciali nel formato della data @@ -5777,7 +5862,7 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Memoria cloud di Subsurface</translation> </message> @@ -5799,76 +5884,61 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/> <source>Save Password locally?</source> - <translation>Salvo la password localemnte?</translation> + <translation>Salvo la password localmente?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface web service</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID utente di default</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Salvare ID utente localmente?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Rete</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Nessun proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Proxy di sistema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Modifiche cancellate. Email e password per il Cloud possono contenete solo lettere, numeri e '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Modifiche cancellate. Email e password per il Cloud possono contenere solo lettere, numeri e '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e password per la memoria cloud possono contenere solo lettere, numeri, '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Memoria cloud di Subsurface (credenziali verificate)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Memoria cloud di Subsurface (password errata)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Memoria cloud di Subsurface (PIN richiesto)</translation> </message> @@ -6197,133 +6267,133 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation>(nº%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Computer sconosciuto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Aggiungi un cambio gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Rendi il computer principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Immersione pianificata</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Immersione inserita manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Cancella questo computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (bot. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Aggiungi cambio setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Aggiungi un segnalibro</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Dividi in due l'immersione</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Cambia la modalità di immersione</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Modifica il profilo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Rimuovi evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Nascondi eventi simili</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Modifica il nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Corregge la pressione della bombola %1 (attualmente interpolata come %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Mostra tutti gli eventi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Nascondi gli eventi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Nascondi tutti gli eventi %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Rimuovere l'evento selezionato?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Modifica il nome del bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Nome personalizzato:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Il nome è troppo lungo</translation> </message> @@ -6331,53 +6401,53 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Avvio...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Apri file di log immersioni locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Apertura del file locale fallita</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 immersioni caricate dal file locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>sto lavorando in modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Errore nella decodifica dell'archivio locale, abbandono</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Credenziali cloud mancanti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Prego inserire credenziali valide per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e password per la memoria cloud possono contenere solo lettere, numeri, '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Formato email errato</translation> </message> @@ -6427,50 +6497,50 @@ Per favore esporta questo modello in un file diverso.</translation> <translation>Non è possibile connettersi al cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenziali per il cloud valide, sto caricando le immersioni</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Errore cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Sto caricando le immersioni dalla memoria locale (modalità "no cloud")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Impossibile connettersi al server cloud, passo alla modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Memoria cloud aperta con successo. Non ho trovato immersioni.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Posizione GPS sconosciuta</translation> </message> @@ -6478,7 +6548,7 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Avvio...</translation> </message> @@ -6570,116 +6640,126 @@ Per favore esporta questo modello in un file diverso.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Impostazioni</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Non definito</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Combinazione utente/password errata</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Le credenziali devono essere verificate</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Credenziali di accesso verificate</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Stato del cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Non applicabile</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Cambia</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Stato</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blu</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>testo normale</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>evidenzia</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Scuro</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Servizio GPS WEB di Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Soglia della distanza (metri)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Valore di soglia in tempo (minuti)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Bombola di default</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Bombola:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Sviluppatore</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Visualizza il menù sviluppatore</translation> </message> @@ -6714,17 +6794,14 @@ Per favore esporta questo modello in un file diverso.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Attenzione! -Non tutte le immagini sono state scattate entro -i 30 minuti prima e 30 minuti dopo la fine delle immersioni -selezionate.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Carica le immagini anche se la data e ora di scatto non coincide con quella dell'immersione.</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6747,39 +6824,39 @@ selezionate.</translation> <translation>Quale data ed orario sono mostrati nell'immagine?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Apri il file dell'immagine</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>File immagini</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Data/ora di immersione selezionate</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Prima data/ora di immersione selezionata</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>ultima data/ora di immersione selezionata</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation>File con data/ora inappropriati </translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Nessun dato Exif trovato</translation> </message> @@ -6872,28 +6949,28 @@ Files with inappropriate date/time</source> <translation>Importa messaggi (Errori, avvertenze, ecc)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Apri i files SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>File SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Tutti i file</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>File Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Apri i file Subsurface</translation> </message> @@ -6901,64 +6978,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Piccolo</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data dell'immersione: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durata: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Luogo immersione: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Compagno: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7095,65 +7172,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Inserisci la User ID e click Download</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>In connessione...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Download finito</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Errore scaricamento: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Errore di connessione:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Identificatore dell'utente non valido!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Non posso analizzare la risposta!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Scaricamento eseguito</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Mute:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Nessun set di mute</translation> </message> @@ -7284,39 +7313,44 @@ Files with inappropriate date/time</source> <translation>Livello di zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Carica immagine(i) da file(s)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Carica immagine(i) dal web</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Cancella le immagini selezionate</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Cancella tutte le immagini</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Rigenera le miniature selezionate</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Sto cancellando le immagini</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Sei sicuro di voler cancellare tutte le immagini?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7484,15 +7518,15 @@ mixati con aria e usando: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Tag:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Tags</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Tag vuoti</translation> </message> @@ -7691,7 +7725,7 @@ mixati con aria e usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1click per visitare %2</translation> </message> @@ -7715,130 +7749,135 @@ mixati con aria e usando: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation> (%1 mostrati)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>n</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Compagno</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Foto prima/durante/dopo l'immersione</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Nazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -7852,81 +7891,81 @@ mixati con aria e usando: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Inserisci una URL per le immagini</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Controlla gli aggiornamenti.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface non è riuscito a controllare gli aggiornamenti.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Si è verificato il seguente errore:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Per favore controlla la tua connessione Internet</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Stai usando la versione più recente di Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>E' disponibile una nuova versione di Subsurface.<br/>Clicca su:<br/><a href="%1">%1</a><br/> per scaricarla.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>E' disponibile una nuova versione di Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>La versione più recente è %1, per favore controlla %2 la nostra pagina di download %3 per le informazioni su come aggiornare.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>La versione più recente è</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Il server ha restituito le seguenti informazioni:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface sta controllando se esistono nuove versioni ogni due settimane. Se non vuoi che Subsurface continui a controllare scegli Rifiuta.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Rifiuta</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Controllo automatico degli aggiornamenti</translation> </message> @@ -8101,6 +8140,19 @@ Lingua: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8156,12 +8208,12 @@ Lingua: %1</translation> <translation>Invia</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>L'operazione è durata troppo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Trasferimenti dati...</translation> </message> @@ -8187,8 +8239,8 @@ Lingua: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Nessun errore</translation> </message> @@ -8312,7 +8364,7 @@ Media</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Errore nel parsing dell'intestazione</translation> </message> @@ -8649,9 +8701,9 @@ Media</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>ossigeno</translation> </message> @@ -8666,131 +8718,131 @@ Media</translation> <translation>Circuito aperto</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>piedi cubi</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>piedi/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>aria</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrato</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>cintura</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>caviglia</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>schienalino</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8867,123 +8919,123 @@ Media</translation> <translation>Nessun profilo di immersione trovato in '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Checkout dallo storage (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Trasferimento dallo storage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Trasferimento allo storage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>La cartella della cache locale %s è corrotta - non è possibile sincronizzare con la memoria cloud di Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Non è stato possibile aggiornare la cache local con i dati remoti più aggiornati</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Memoria cloud di Subsurface corrotta</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Non ho potuto aggiornare la memoria cloud di Subsurface, riprovare più tardi</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Dati remoti e dati locali non coincidono. Errore: unione fallita (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Dati locali e dati remoti non coincidono. Non è possibile unire i cambiamenti locali e remoti</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Dati remoti e dati locali non coincidono</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Dati remoti e dati locali non coincidono. Errore: impossibile scrivere i dati (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemi con la cache locale della memoria cloud Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Dati della cache spostati in %s. Perfavore, riprova di nuovo</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Aggiornamento storage locale con lo storage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Trasferimento delle modifiche locali allo storage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Tentativo di unire le modifiche locali allo storage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Memorizza i dati nello storage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sincronizzazione con lo storage cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Impossibile connettersi al server cloud, lavora con i dati locali</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Connessione con il cloud riuscita, scaricamento dei dati</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Sincronizzazione con lo storage cloud riuscita</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Errore nella connessione alla memoria cloud di Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Errore (%s) nel clone git di %s</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Sincronizzazione dei dadi in corso</translation> </message> @@ -9082,119 +9134,119 @@ Media</translation> <translation>numero evento non valido</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Errore analizzando la data/il tempo</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Immersione #%d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Errore analizzando il tempo di immersione</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Errore analizzando la profondità massima</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Errore analizzando la temperatura</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Errore analizzando il conteggio della miscela di gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Errore nell'ottenimento della salinità dell'acqua</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Errore nell'ottenere la pressione superficiale</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Errore nella ricezione della modalità immersione</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Errore analizzando la miscela di gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Impossibile creare un parser per %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Errore registrando la data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Immersione già scaricata a %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>modello=%s firmware=%u seriale=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Errore all'apertura di %s %s (%s). Di solito per capire il problema è utile mandare i file di log agli sviluppatori. Puoi copiarli nella clipboard attraverso la maschera Informazioni.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9203,13 +9255,13 @@ Di solito per capire il problema è utile avere un file di log di libdivecompute Puoi crearne uno selezionando il corrispondente checkbox nella maschera di download.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Non sono state trovate nuove immersioni nel computer subacqueo</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Ci sono più coordinate GPS per questo luogo di immersione, anche %s @@ -9217,19 +9269,19 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>nome addizionale per il sito: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Carica le immersioni dalla cache locale</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Dati di immersione letti correttamente</translation> </message> @@ -9253,12 +9305,12 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Impossibile analizzare '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </message> @@ -9289,8 +9341,8 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>, GF reale=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Cambio SP</translation> </message> @@ -9552,17 +9604,17 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>Valore pO₂ basso %.2f a %d:%02u con il gas %s aalla profondità %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Non trovo il gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9571,21 +9623,21 @@ D:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min @@ -9593,63 +9645,63 @@ D:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN₂ %s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sosta di sicurezza: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9658,7 +9710,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9667,175 +9719,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densità: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sosta di sicurezza: tempo sconosciuto @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: tempo sconosciuto @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Ceiling calcolato %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tessuti %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>CDI nel tessuto pilota </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>frequenza cardiaca: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Direzione: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>Profondità media fin qui %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9884,142 +9936,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>ARIA</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>più di %1 giorni</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n immersione(i))</numerusform><numerusform>(%n immersione(i))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OSSIGENO</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Non posso aprire il file %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Numero</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Ora</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temperatura atmosferica</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temperatura dell'acqua</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Immersioni</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Espandi tutto</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Minimizza tutto</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Viaggi</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistiche</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Ricerca avanzata</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibilità</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Compagno</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Muta</translation> </message> @@ -10030,180 +10082,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Note</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mostra maggiori dettagli</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Statistiche Annuali</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Anno</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Tempo totale</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Durata media</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Durata più breve</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Durata più lunga</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Profondità media</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Profondità minima</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Profondità massima</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>CAS medio</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>CAS minimo</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>CAS massimo</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temperatura media</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temperatura minima</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temperatura massima</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Indietro alla lista</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Immersione nº</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Profilo di immersione</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>informazioni dell'immersione</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Attrezzatura</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Dimensione</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pressione di esercizio</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Pressione iniziale</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Pressione finale</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Eventi</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valore</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordinate</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Stato dell'immersione</translation> </message> @@ -10233,62 +10285,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Tutti (dalle statistiche dei viaggi)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Gen</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mag</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Giu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Lug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Ott</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dic</translation> </message> @@ -10539,12 +10591,17 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>profondità massima</translation> @@ -10570,77 +10627,77 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Note:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Anno di costruzione</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Affondamento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Tempo di affondamento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Ragione</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nazionalità</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Cantiere</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Tipo di nave</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Lunghezza</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Larghezza</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Pescaggio</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Stazza</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Mercantile</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Dati del relitto</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitudine</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Profondità</translation> </message> @@ -10685,27 +10742,27 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Città</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Inizio salvataggio dei dati</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Inizio salvataggio delle immersioni</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Creazione della cache locale riuscita</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Preparazione al salvataggio dei dati</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>cambia modalità</translation> </message> @@ -10720,7 +10777,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Rimuovi questo punto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Non salvare un log vuoto nel cloud</translation> </message> @@ -10740,22 +10797,22 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Massimo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Risposta non valida dal server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Tag XML atteso 'DiveDateReader', trovato invece '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Tag XML atteso 'DiveDateReader' non trovato</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Risposta XML malformata. Linea %1: %2</translation> </message> @@ -10768,112 +10825,102 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Lista immersioni</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Gestione dell'immersione</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Disabilita sincronizzazione automatica con il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Abilita auto sincronizzazione con il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Disabilita il servizio di localizzazione</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Impostazioni</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Aggiungi immersione manualmente</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Download dal computer di immersione</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Sincronizzazione manuale con il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Disabilitando la sincronizzazione con il cloud i dati saranno memorizzati localmente. Molto utile in caso di mancanza di rete. Scegliere 'sincronizzazione manuale' se si vuole trasferire i propri dati nella memoria cloud.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Carica dati GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Applica i punti GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Scarica dati GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Mostra i punti GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Cancella la cache del GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Sviluppatore</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Log dell'app</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informazioni sul tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Informazioni</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Avvia il servizio di localizzazione</translation> </message> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 2646423f5..c71f56694 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1658,100 +1658,100 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Kļūda</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1967,22 +1967,22 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1990,103 +1990,135 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Vieta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Ilgums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Gaisa temp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Ūdens temp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Kostīms:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Draugs:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Niršanas speciālists:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Novērtējums:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Piezīmes:</translation> </message> @@ -2255,104 +2287,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Izvērst visu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Savērst visu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Savērst pārējus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Izveidot jaunu ceļojumu augšup</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Saplūdināt ceļojumu ar augšējo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Saplūdināt ceļojumu ar apakšējo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Izdzēst niršanu(-as)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Atzīmēt niršanu(-as) kā nepareizus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Saplūdināt izvēlētas niršanas</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Pārnumurēt niršanu(-as)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Atvērt attēla failu</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2553,7 +2600,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Gaišs</translation> </message> @@ -2563,121 +2610,121 @@ GPS location:</source> <translation>Smilts</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Eksportēt UDDF failu kā</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Eksportēt CSV failu kā</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Eksportēt pasaules karti</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Eksportēt Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Eksportēt HTML failus, kā</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Nevar atvērt failu %s</translation> </message> @@ -3037,62 +3084,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>nezināms</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Gala dziļums</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Izpildes laiks</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Izm. gāze</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3293,260 +3340,266 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Maks. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotogrāfijas</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Draugs</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>neviena niršana nebija izvēlēta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>neizdevas izveidot ZIP failu augšupielādēšanai: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>iekšēja kļūda</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Izdarīts</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Augšupielādē niršanas sarakstu...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Niršanas saraksta lejupielādēšana...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Lejupielādē %1 niršanas...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Lejupielādēšana pabeigta - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Bojāta lejupielādēšana</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Nevar atvērt arhīvu: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Augšupielādēšana ir pabeigta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Augšupielādēšana neizdodas</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Sekmīga augšupielādēšana</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Pieteikšanās neizdevās</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Nevar noparsēt atbildi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Kļūda: %1</translation> </message> @@ -3554,23 +3607,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Lejupielādēt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Kļūda</translation> </message> @@ -3580,42 +3633,47 @@ p, li { white-space: pre-wrap; } <translation>Atrast Uemis niršanas datoru</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</translation> </message> @@ -3687,9 +3745,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Lejupielādēt</translation> </message> @@ -3715,7 +3773,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Atcelt</translation> </message> @@ -3730,57 +3788,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Atkārtot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3811,12 +3875,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3824,22 +3888,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3855,17 +3919,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3920,17 +3984,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3946,7 +4010,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3961,17 +4025,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4064,40 +4128,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Vieta</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4105,7 +4169,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4229,8 +4293,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Piezīmes</translation> </message> @@ -4251,19 +4315,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Gaisa temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Ūdens temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -4344,8 +4408,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotogrāfijas</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4378,53 +4442,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Gaisa temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Ūdens temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Ceļojuma rediģēšana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Daudzkārtīga ceļojumu rediģēšana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Niršanas rediģēšana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Ceļojuma piezīmes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Ceļojuma vieta</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Atcelt izmaiņas?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Jūs taisāties atcelt izmaiņas.</translation> </message> @@ -4457,424 +4521,419 @@ p, li { white-space: pre-wrap; } <translation>&Imports</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Jauns žunāls</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Jauns</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Atvērt žurnālu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Atvērt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Saglabāt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Saglabāt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Aizvērt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Drukāt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Preferences</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Pabeigt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importēt no &niršanas datora</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importēt &GPS datus no Subsurface servissa</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Pievienot niršanu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Pārnumurēt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>&Auto-grupēšana</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Gada statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Niršanas saraksts</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Profils</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Visi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Nākamais DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Par Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Plānotājs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importēt žurnalēšanas failu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importēt žurnālus no citām programmām</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importēt &no divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Pilnekrāns</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Pārslēgt pilnekrāna režīmu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation> &Pārbaudīt atjaunāšanas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Eksports</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Pārslēgt pHe grafiku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Pārslēgt pulsu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Pārslēgt MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Pārslēgt EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Pārslēgt NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Atvērt failu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4888,212 +4947,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms fails aizvēršanas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas pievienošanas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Izdrukāt niršanas tabulu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Gada statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vai velāties saglabāt izmaiņas datnē %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Saglabāt izmaiņas?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Izmaiņas pazūs, ja tos nesaglabāt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Atvērt niršanas žurnālu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5149,7 +5208,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5157,39 +5216,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5327,7 +5386,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5352,6 +5411,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5382,29 +5442,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Dzēst visus iestatījumus</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Atvērt noklusējamo žurnalēšanas datni</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5559,7 +5644,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5599,7 +5684,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profils</translation> </message> @@ -5678,25 +5763,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5747,7 +5832,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5772,73 +5857,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface tīmekļa serviss</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Lietotāja ID pēc noklusējama</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Saglabāt lietotāja ID lokāli?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Tīkls</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6166,133 +6236,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation>(#%1 no %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Pievienot gāzes maiņu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Pievienot grāmatzīmi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Noņemt notikumu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Paslēpt līdzīgus notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Rediģēt vārdu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Parādīt visus notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Paslēpt notikumus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Paslēpt visus %1 notikumus?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Nodzēst izvēlēto notikumu?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Rediģēt grāmatzīmes vārdu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Vārds:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6300,53 +6370,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6396,50 +6466,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6447,7 +6517,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6539,116 +6609,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tēma</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Noklusējamais balons</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6683,13 +6763,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6713,38 +6793,38 @@ Not all images have timestamps in the range between <translation>Kurš datums un laiks ir attēlots?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Atvērt attēla failu</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6837,28 +6917,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6866,59 +6946,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7054,65 +7134,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Tīmekļserviss</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Pieslēdzas...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Lajupielādēšana pabeigta</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Lejupielādēšanas kļūda: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Savienojuma kļūda:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Nepareizs lietotāja identifikators!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Nevar saparsēt atbildi!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Lejupielādēšana ir sekmīga</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7243,38 +7275,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7441,15 +7478,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Tagi</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7648,7 +7685,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7672,130 +7709,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Draugs</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -7809,80 +7851,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Pārbaudīt atjaunāšanas.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface'am neizdevas pārbaudīt atjaunāšanas</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Sekojoša kļūda gadījas:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8055,6 +8097,19 @@ Valoda: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8110,12 +8165,12 @@ Valoda: %1</translation> <translation>Augšupielādēt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Procesa izpilīdšanas laiks pārsniedza robežus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8141,8 +8196,8 @@ Valoda: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8266,7 +8321,7 @@ Vidējais</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8602,9 +8657,9 @@ Vidējais</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8619,131 +8674,131 @@ Vidējais</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>paskāls</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>gaiss</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrēts</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>josta</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>svars uz kājām</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8820,123 +8875,123 @@ Vidējais</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9035,149 +9090,149 @@ Vidējais</translation> <translation>kļūdains notikuma numurs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Kļūda parsējot laiku</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Kļūda parsējot niršanas laiku</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Kļūda parsējot maks. dziļumu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Kļūda ūdens sāļuma noteikšanā</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Kļūda spiediena noteikšanā uz virsmu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Kļūda parsējot gāzes maisījumu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Kļūda reģistrējot datus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Notikums: gaida lietotāja darbību</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Nevar atvērt %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9200,12 +9255,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Kļūme parsējot '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Nevar atvērts stila lapu %s</translation> </message> @@ -9236,8 +9291,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9499,17 +9554,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Nevar atrast gāzi %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9518,128 +9573,128 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>Ā: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Dekompr.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Dekompresijā </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -9648,126 +9703,126 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Dekompr.: %umin @ %.0f%s (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Dekompresijā (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (izrēķ.) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Aprēķināta maks. dekompr. pietura %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>azimuts: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9816,142 +9871,142 @@ EADD: %d%s / %.1fg/ℓ <translation>R</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Gaisa</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Nevar atvērt failu %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Laiks</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Gaisa temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Ūdens temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Niršanas</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Izvērst visu</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Savērst visu</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Redzamība</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Niršanas speciālists</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Draugs</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Kostīms</translation> </message> @@ -9962,180 +10017,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Piezīmes</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Gada statistika</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Kopējais laiks</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Maks. dziļums</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Niršana #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tips</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Izmērs</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinātas</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10165,62 +10220,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Maijs</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jūn</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jūl</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10466,12 +10521,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10497,77 +10557,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Piezīmes:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Augstums</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Dziļums</translation> </message> @@ -10612,27 +10672,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10647,7 +10707,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Noņemt šo vietu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10667,22 +10727,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maksimums</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Nederīga servera atbilde</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Gaidīja XML tagu 'DiveDateReader', bet saņēma '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Gaidīts XML tags 'DiveDates' nav atrasts</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation> </message> @@ -10695,112 +10755,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index e027a2e30..40a6cca52 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -166,160 +166,160 @@ <translation>Leter etter enheter...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Scanning ferdig.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Den lokale Bluetooth-enheten ble %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>skrudd på</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>skrudd av</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Tilstand: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan brukes. Trykk "Lagre"-knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheten %1 må pares for å bli bruk. Bruk menyen for paringsvalg.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>En tom adresse kan ikke brukes for en enhetstilkobling</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Den lokale enheten ble endret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Par</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Fjern paring</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Prøver å pare %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Prøver å fjerne paring for %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Fjernet paring for %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>%1 er paret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>%1 ble paret og er autorisert.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>%1 kan nå bli bruk til forbindelse. Trykk "Lagre"-knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Enhetsfeil: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Paringsfeil. Hvis enheten krever en spesiell PIN-kode, prøv å pare den ved hjelp av operativsystemet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Ukjent feil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetoothadapteren er avskrudd, skru den på før søk.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Feil ved skriving til eller lesing fra enheten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>En ukjent feil inntraff.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Feil ved søk etter enhet: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Ikke tilgjengelig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Den lokale bluetooth-adapteren er ikke tilgjengelig.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Søkeagenten ble ikke opprettet siden adressen %1 ikke stemmer overens med den fysiske adressen til noen av de lokale bluetooth-enhetene.</translation> </message> @@ -327,12 +327,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Person: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Søk etter buddyer og dykkeledere</translation> </message> @@ -340,7 +340,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Ingen buddyer</translation> </message> @@ -1661,102 +1661,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Backupinnstillinger for computer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Sikkerhetskopier</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Feil ved XML-backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>En feil inntraff under lagring av backupfila. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup OK</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Instillingene ble lagret til: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Gjenopprett computerinnstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Feil ved gjenoppretting fra XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>En feil inntraff ved gjenoppretting av backupfila. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Gjenoppretting OK</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Innstillingene dine har blitt gjenopprettet.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Velg firmware-fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Kobler til enhet...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Enhet er tilkoblet</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Koblet fra enhet</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> @@ -1971,22 +1971,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Detaljer for dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Avbryt redigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Vis på kart</translation> </message> @@ -1994,104 +1994,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Dykk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Sted:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Bruk nåværende GPS-posisjon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Lengde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Flaske:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gassmiks:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Starttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Sluttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notater:</translation> </message> @@ -2260,104 +2292,119 @@ GPS-posisjon:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Flytt på dykketider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Del opp valgte dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Hent bilde(r) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Hent bilde fra web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Bildefiler (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 er ikke et bilde</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Bildefiler</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Åpne bilder</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Alle filer</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 er ikke et bilde</translation> </message> </context> <context> @@ -2558,7 +2605,7 @@ GPS-posisjon:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Lys</translation> </message> @@ -2568,121 +2615,121 @@ GPS-posisjon:</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Generelt format som brukes til datautveksling mellom en mengde dykkerelaterte programmer.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Dykkeprofil med kommaseparerte verdier.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Dykkeinformasjon som kommaseparerte verdier. Dette inkluderer de fleste dykkedetaljene men ikke profilinformasjonen.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send dataene til divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Send dykkedata til dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface sitt eget XML-format.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Skriv dybdedata fra bilder til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Lagre dykk som TeX-makroer til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF-filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF-filer</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV-filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML-filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX-filer</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Eksporter CSV-file som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Eksporter verdenskart</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Lagre dybdedata fra bilder </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Eksporter til TeX-fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Eksporter HTML-filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Vent, eksporterer...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Klarer ikke åpne fila %s</translation> </message> @@ -3042,62 +3089,62 @@ GPS-posisjon:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>syl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Stopptider</translation> </message> @@ -3302,261 +3349,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Bilder</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Bilder før/under/etter dykk</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>ingen dykk valgt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>kunne ikke finne stilark for eksport til divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>klarte ikke å lage zipfil for opplasting: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>intern feil</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Konvertering av dykk %1 til divelogs.de-format feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>kunne ikke skrive zip-fil: %s zip-feil %d system-feil %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne ikke åpnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3564,23 +3617,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Kobler til dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Feil</translation> </message> @@ -3590,42 +3643,47 @@ p, li { white-space: pre-wrap; } <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Velg binær dumpfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Dump-filer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Prøv nedlasting på nytt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation> </message> @@ -3697,9 +3755,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3725,7 +3783,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3740,57 +3798,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth er ikke skrudd på</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Leverandør:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Dykkecomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Skann på nytt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> @@ -3821,12 +3885,12 @@ p, li { white-space: pre-wrap; } <translation>Koble til Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Bruk "Del på"-menyen for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation> </message> @@ -3834,22 +3898,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Logget inn på Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Feil, ukjent bruker-id, kan ikke logge inn.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Lastet opp dykk til Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Kunne ikke laste opp dykk. Se debug-meldinger og send til epostlista til Subsurface</translation> </message> @@ -3865,17 +3929,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inverter valg</translation> </message> @@ -3930,17 +3994,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3956,8 +4020,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Gå gjennom bildekataloger</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3971,17 +4035,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4074,40 +4138,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Sted:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Sted</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(samme GPS-lokasjon)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 borte</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dykk her)</numerusform><numerusform>, %n dykk her)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(ingen eksisterende GPS-data, legg til GPS-data fra dette dykket)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(ingen GPS-data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Velg sted:</translation> </message> @@ -4115,7 +4179,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Ingen sted er satt</translation> </message> @@ -4240,8 +4304,8 @@ Er du sikker på at du vil fortsette?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -4262,19 +4326,19 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Sted</translation> </message> @@ -4355,8 +4419,8 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Bilder</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4389,53 +4453,53 @@ Er du sikker på at du vil fortsette?</translation> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4468,424 +4532,419 @@ Er du sikker på at du vil fortsette?</translation> <translation>&Importer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>R&ediger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Del på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Ny loggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Åpne l&oggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Åpne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Valg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importer fra &dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importer &GPS-data fra Subsurface webtjeneste</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Rediger device&navn</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Legg til dykk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>R&ediger dykk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Kopier dykkekomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Lim inn dykkekomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Auto&grupper</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Dykkeliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Fo&rrige computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Neste computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Om Subsurf&ace</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Bruker&manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>Kart</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanlegg dykk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importer loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importer dykkelogg fra andre programmer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importer &fra divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Fullskjerm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Fullskjerm av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Se etter oppdateringer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Eksporter dykkelogger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Konfigurer &dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Rediger &dykk i planlegger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Skru av/på pO₂-graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Skru av/på pN₂-graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Skru pHe-graf av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Skru av/på dekograf fra computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Skru av/på dekograf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Skru av/på utregning av vev</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skru av/på 3m-inkrementer for dekotak</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Skru av/på hjertefrekvens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Skru av/på MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Skru av/på EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Skru av/på NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Skru av/på SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Skru av/på linjal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Skaler graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Skru av/på bilder</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Skru gass-bar av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrer dykkeliste</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Slå heap-map av/på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Brukerunder&søkelse</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Gjør om</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Finn bilder som er flyttet</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Åpne skylager</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Lagre til skylager</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Dykkestedsdatabase</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>R&ediger dykkested</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Skylagring er på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Sikkerhertskopi av templat opprettet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4908,214 +4967,214 @@ templatene være skrivebeskyttet og bør ikke redigeres direkte, siden programmet kan overskrive dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Lagre eller avbryt redigeringen av dykk før du går online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Du har ulagrede endringer. Ønsker du å lagre dem til skyen? Hvis du svarer nei vil skylagring kun bli synkronisert neste gang du velger "Åpne skylagring" eller "Lagre til skyen"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Kunne ikke skru på skylagring</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Lagre eller avbryt redigeringen før du lukker fila.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Avslutt denne redigeringa før du starter en ny.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Dykkeloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du lagre endringene i fila %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du lagre endrinene i datafila?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Du åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen. Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -5172,7 +5231,7 @@ QML-modulene QtPositioning og QtLocation mangler muligens!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter viser %1 (av %2) dykk</translation> </message> @@ -5180,12 +5239,12 @@ QML-modulene QtPositioning og QtLocation mangler muligens!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Du burde oppdatere firmwaren på computeren din: du har versjon %1 men den siste stabile versjonen er %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5194,27 +5253,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-nedlasting før du starter oppdateringen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Ikke nå</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Oppdater firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmwareoppgraderingsnotis</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Lagre den nedlastede firmwaren som</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware-filer</translation> </message> @@ -5352,8 +5411,8 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Ingen forhåndsvalgt fil</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5377,6 +5436,7 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5407,29 +5467,54 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Slett alle valg</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Tilbakestill valg til standardverdier</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Generelt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Åpne standardloggfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5584,8 +5669,8 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Lag miniatyrbilde på nytt hvis de er eldre enn bilde</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5624,7 +5709,7 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Vis snittdybde i profil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5703,27 +5788,27 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>For å bytte språk må du starte Subsurface på nytt.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Disse vil bli brukt som de er. Det er kanskje ikke hva du ønsker. Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Bokstavelige tegn</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Ikke-spesielle tegn i tidsformatet. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Ikke-spesielle tegn i datoformatet. @@ -5775,7 +5860,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Skylager for Subsurface</translation> </message> @@ -5800,73 +5885,58 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Lagre passord lokalt?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface webtjeneste</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Standard bruker-ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Lagre bruker-ID lokalt?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Nettverk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>System-proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP-proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS-proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Endring ignorert. Epost og passord for skylagring kan kun bestå av bokstaver, nummer, og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Endring ignorert. Epost og nytt passord for skylagring kan kun bestå av bokstaver, nummer, og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Skylager for Subsurface (bruker godkjent)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface skylagring (feil passord)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface skylagring (PIN kreves)</translation> </message> @@ -6195,133 +6265,133 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Endre dykkemodus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Juster trykket på syl. %1 (interpolert som %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -6329,53 +6399,53 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> @@ -6425,50 +6495,50 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fikk ikke koblet til skylagring, skrur tilbake til lokal modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6476,7 +6546,7 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Starter...</translation> </message> @@ -6568,116 +6638,126 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Udefinert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Feil brukernavn/passord</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Bruker/passord må verifiseres</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Bruker/passord verifisert</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Ingen skymodus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Skystatus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Epost</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Ikke relevant</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Endre</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blå</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>vanlig tekst</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Høydepunkter</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Mørkt</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Webtjeneste for Subsurface GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Terskelverdi for avstand (meter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Terskelverdi for tid (minutter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Standardflaske</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Flaske:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Vis utviklermeny</translation> </message> @@ -6712,16 +6792,14 @@ Eksporter denne templaten til en annen fil.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Advarsel! -Noen av bildene har datostempel 30 før eller etter -valgte dykk. </translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Last inn bilder selv om tidsstempel ikke stemmer overens med tiden til dykket</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6744,39 +6822,39 @@ valgte dykk. </translation> <translation>Hvilket dato og tid vises på bildet?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Bildefiler</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Første valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Siste valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Filer med upassende dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Ingen Exif-dato/-tid funnet</translation> </message> @@ -6869,28 +6947,28 @@ Filer med upassende dykkedato/-tid</translation> <translation>Import-beskjeder (feil, advarsler, osv)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Åpne SmartTrak-filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak-filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Åpne Subsurface-filer</translation> </message> @@ -6898,64 +6976,64 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Liten</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sted: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Dykkeleder: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7092,65 +7170,17 @@ Filer med upassende dykkedato/-tid</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Skriv inn bruker-ID og trykk Last ned</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Nettjeneste</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Kobler til...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Nedlasting er ferdig</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Feil ved nedlasting: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Forbindelsesfeil:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Ugyldig bruker-ID!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Kan ikke lese svar!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Nedlasting ferdig</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Drakter:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Ingen drakt er satt</translation> </message> @@ -7281,39 +7311,44 @@ Filer med upassende dykkedato/-tid</translation> <translation>Zoomnivå</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Hent bilde(r) fra fil(er)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Hent bilde(r) fra web</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Sletter valgte bilder</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Slett alle bilder</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Lag valgte miniatyrbilder på nytt</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Sletter bilder</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Er du sikker på at du vil slette alle bilder?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7481,15 +7516,15 @@ fra luft og bruker: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Emneord:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Emner</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Ingen emneord</translation> </message> @@ -7688,7 +7723,7 @@ fra luft og bruker: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1klikk for å besøke %2</translation> </message> @@ -7712,130 +7747,135 @@ fra luft og bruker: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 vist)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Bilder før/under/etter dykk</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Sted</translation> </message> @@ -7849,81 +7889,81 @@ fra luft og bruker: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Legg inn URL for bilder</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Se etter oppdateringer.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface klarte ikke å se etter oppdateringer.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Den følgende feilen inntraff:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Sjekk internettforbindelsen din.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Du bruker den siste versjonen av Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>En ny Subsurface-versjon er tilgjengelig.<br/>Klikk på <br/><a href="%1">%1</a><br/> for å laste den ned.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>En ny versjon av Subsurface er tilgjengelig.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Den siste versjonen er %1, se på %2 nedlastingssiden vår %3 for informasjon om hvordan du oppgraderer.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Den nyeste versjonen er</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Serveren svarte med denne informasjonen: </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface sjekker hver andre uke om en ny versjon er tilgjengelig. Hvis du ikke vil dette, trykk Avslå.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Avslå</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Sjekk etter oppdateringer automatisk</translation> </message> @@ -8098,6 +8138,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8153,12 +8206,12 @@ Language: %1</source> <translation>Last opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Handlingen fikk tidsavbrudd</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Overfører data...</translation> </message> @@ -8184,8 +8237,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Ingen feil</translation> </message> @@ -8309,7 +8362,7 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> @@ -8646,9 +8699,9 @@ Snitt</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8663,131 +8716,131 @@ Snitt</translation> <translation>Åpent system</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrert bly</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>vektbelte</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>ankelvekt</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>bakplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8864,123 +8917,123 @@ Snitt</translation> <translation>Ingen dykkeprofil funnet i '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Henter ut fra lager (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Henter fra lager (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Laster opp til lager (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Lokalt mellomlager i %s er ødelagt - kan ikke synkronisere med Subsurface skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Kunne ikke oppdatere lokalt mellomlager med nyere data</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface skylager ødelagt</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Kunne ikke oppdatere Subsurface skylager, prøv igjen senere</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Skylager og lokal data er forskjellig. Klarer ikke å kombinere nye data med lokale data.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Skylager og lokal data er forskjellig</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Skylager og lokal data er forskjellig. Feil: kunne ikke skrive data (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemer med det lokale mellomlageret til skylageret</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Flyttet mellomlager til %s. Prøv igjen.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Oppdaterer lokalt lager til å matche skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Dytter lokale endringer til skyen</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Prøver å slå sammen lokale endringer til skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Lagrer data til skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Synkroniserer med skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Kunne ikke nå skyserver, bruker isteden lokal data</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Koblet til skylager, henter data</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Ferdig å synkroniserer med skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Klarte ikke å koble til skylager for Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Synkroniserer datafil</translation> </message> @@ -9079,119 +9132,119 @@ Snitt</translation> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Klarte ikke å lese temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Kunne ikke hente dykkemodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Kunne ikke lage parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Ferdig å laste ned dykk på %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Kunne ikke åpne enhet %s %s (%s). I de fleste tilfeller er det nyttig for utviklerne om du sender dem loggfilene. Du kan kopiere dem til utklippstavlen i "Om"-dialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9200,13 +9253,13 @@ I de fleste tilfeller vil en logg fra libdivecomputer være nyttig for å feils Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Ingen dykk lastet ned fra dykkecomputer</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s @@ -9214,19 +9267,19 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Last inn dykk fra lokal cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Åpnet dykkelogg</translation> </message> @@ -9249,12 +9302,12 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -9285,8 +9338,8 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Endring av SP</translation> </message> @@ -9548,17 +9601,17 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9567,84 +9620,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9653,7 +9706,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9662,175 +9715,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Tetthet: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vev %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD i ledende vev </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>snittdybde hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9879,142 +9932,142 @@ EADD: %d%s / %.1fg/ℓ <translation>V</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mer enn %1 dager</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>Oksygen</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Klarer ikke åpne fila %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Tall</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Turer</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistikk</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Avansert søk</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Drakt</translation> </message> @@ -10025,180 +10078,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Vis flere detaljer</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>År</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Totaltid</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Snittid</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Korteste tid</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Lengste tid</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. dybde</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Snitt-SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Maks. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Snitt-temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. temp</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Maks. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Tilbake til liste</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Dykkeprofil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Dykkeinformasjon</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Dykkerutstyr</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Størrelse</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Trykkrating</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Hendelser</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Navn</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Verdi</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Dykkestatus</translation> </message> @@ -10228,62 +10281,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Alle (ved turstatistikk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>des</translation> </message> @@ -10535,12 +10588,17 @@ Er Uemis Zurich plugget i ordentlig?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sek</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Maksdybde</translation> @@ -10566,77 +10624,77 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Notater:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Sank</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Nedstigningstid</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Reason</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationality</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Length</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Draught</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Displacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Wreck Data</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Høyde over havet</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Dybde</translation> </message> @@ -10681,27 +10739,27 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Lagrer data</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Lagrer dykk</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>modusendring</translation> </message> @@ -10716,7 +10774,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Fjern dette punktet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Ikke lagre en tom logg til skyen</translation> </message> @@ -10736,22 +10794,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Forventet XML-tag 'DiveDateReader', men fikk '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Fant ikke XML-tag 'DiveDates' som forventet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> @@ -10764,112 +10822,102 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Administrasjon av dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Skru av automatisk synk mot skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Skru på automatisk skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Skru av lokasjonstjeneste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Lastet ned fra DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Ved å skru av automatisk skysynkronisering vil all data bli lagret lokalt. Dette kan være nyttig ved begrenset eller ingen nettverkstilgang. Velg "Manuell synk med skyen" hvis du har nettverkstilgang og ønsker å synke til skyen.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Last opp GPS-data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Legg til GPS-fiks</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Last ned GPS-data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 467c43793..aed01466d 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -167,160 +167,160 @@ <translation>Externe toestellen zoeken...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Scan was succesvol.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Het lokale Bluetooth toestel was %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>aangezet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>uitgezet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Toestand: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Toestel %1 kan gebruikt worden voor connectie. Druk op de Opslaan knop.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Toestel %1 moet gekoppeld worden om te kunnen gebruiken. Gebruik het context menu voor koppeling-opties.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Een toestel heeft en niet-nul adres nodig voor verbinding.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Het lokale toestel is veranderd.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Koppel</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Ontkoppel</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Probeer toestel %1 te koppelen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Probeer toestel %1 te ontkoppelen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Toestel %1 was ontkoppeld.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Toestel %1 was gekoppeld.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Toestel %1 is gekoppeld en toegestaan.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Toestel %1 kan gebruikt worden voor connectie. Druk op de Opslaan knop.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Lokaal toestel fout: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Koppel fout. Als het externe toestel een specifieke PIN code vereist, probeer dan te koppelen via het besturingssysteem.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Onbekende fout</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>De Bluetooth adapter staat uit, zet hem aan voor koppeling.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Lezen van of schrijven naar het toestel faalt.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Een onbekende fout trad op</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Toestel vind-fout: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Niet beschikbaar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Geen toegang tot het lokale Bluetooth toestel.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>De vind-agent was niet aangemaakt omdat het %1 adres niet overeenkomt met het fysieke adapter adres van enig lokaal Bluetooth toestel.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Persoon:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>zoekt naar buddies en divemasters</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Geen buddies</translation> </message> @@ -598,7 +598,7 @@ <message> <location filename="../core/configuredivecomputer.cpp" line="221"/> <source>Could not save the backup file %1. Error Message: %2</source> - <translation>Kan het backup bestand %1 niet bewaren. Foutmelding: %2</translation> + <translation>Kan het backup bestand %1 niet opslaan. Foutmelding: %2</translation> </message> <message> <location filename="../core/configuredivecomputer.cpp" line="237"/> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Backup duikcomputer instellingen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Backup bestanden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Fout in XML backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Fout tijdens het opslaan van het backup bestand %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup geslaagd</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> - <translation>Uw instellingen zijn bewaard in: %1</translation> + <translation>Uw instellingen zijn opgeslagen in: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Instellingen duikcomputer herstellen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Fout bij het herstellen van XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Fout tijdens het herstellen van het backup bestand. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Herstelling geslaagd</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Uw instellingen zijn hersteld.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Firmware bestand selecteren</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Log bestanden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> - <translation>Verbinding wordt opgezet...</translation> + <translation>Verbinden met toestel...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Verbonden met toestel</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Verbinding verbroken met toestel</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Kies een bestand om duikcomputer log te downloaden</translation> </message> @@ -1973,22 +1973,22 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Duikdetails</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Duik verwijderen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Onderbreek edit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Toon op kaart</translation> </message> @@ -1996,104 +1996,136 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Duik %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Locatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coördinaten:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Gebruik huidige GPS locatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Diepte:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Duur:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Lucht Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Fles:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Fles1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Startdruk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Einddruk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Fles2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Fles3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Fles4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Fles5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Zicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notities:</translation> </message> @@ -2262,104 +2294,119 @@ GPS locatie:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Alles uitklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Alles inklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Andere samenklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Duik(en) uit trip verwijderen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Nieuwe trip hierboven invoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Duik(en) toevoegen aan de trip hierboven</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> - <translation>Voeg duik(en) toe aan de trip hieronder</translation> + <translation>Duik(en) toevoegen aan de trip hieronder</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Trip met bovenstaande samenvoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Trip met onderstaande samenvoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Duik(en) verwijderen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> - <translation>Markeer duik(en) als ongeldig</translation> + <translation>Duik(en) als ongeldig markeren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Geselecteerde duiken samenvoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> - <translation>Duik(en) opnieuw nummeren</translation> + <translation>Duik(en) hernummeren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Tijdstip verschuiven</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> - <translation>Splits geselecteerde duiken</translation> + <translation>Geselecteerde duiken splitsen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Laad foto('s) van bestand(en)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Laad foto van het web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Afbeeldingen (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Open media bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 lijkt geen foto bestand</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Media bestanden</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Afbeeldingen</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Afbeelding openen</translation> + <source>Video files</source> + <translation>Video bestanden</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Alle bestanden</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 lijkt geen foto bestand</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS locatie:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Licht</translation> </message> @@ -2570,121 +2617,121 @@ GPS locatie:</translation> <translation>Zandkleurig</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma's.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Waarden gescheiden door komma's die het duikprofiel beschrijven.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Waarden gescheiden komma's met duikinformatie. Deze omvatten een groot deel van de informatie, uitgezonderd het duikprofiel.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Zend de duikgegevens naar de divelogs.de website.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Verzend duikgegevens naar dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML export van duiklocaties op een wereldkaart.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface XML bestandsindeling.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Voeg dieptes waarop foto's genomen zijn toe aan het bestand.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Schrijf duik als TeX macro's naar bestand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exporteer UDDF bestand als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF bestanden</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX bestanden</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exporteer CSV bestand als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Wereldkaart exporteren</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exporteer Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Bewaar dieptes waarop de foto's genomen zijn</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exporteer naar TeX bestand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exporteer HTML bestanden als</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Even geduld, bezig met exporteren...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Kan het bestand %s niet openen</translation> </message> @@ -3044,62 +3091,62 @@ GPS locatie:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>cyl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gebruikt Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Duikmodus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Stop tijden</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Trefwoorden</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Foto's</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Media</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Foto's voor/gedurende/na duik</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Media voor/gedurende/na duik</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>geen duiken geselecteerd</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>stylesheet om naar divelogs.de te exporteren is niet gevonden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>kan zip bestand voor upload niet aanmaken: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>interne fout</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> - <translation>Conversie van duik %1 naar divelogs.de formaat is gefaald</translation> + <translation>Conversie van duik %1 naar divelogs.de formaat is mislukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>Fout bij schrijven zip bestand: %s zip fout %d systeem fout %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Klaar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Duiklijst wordt opgeladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Duiklijst wordt geladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>%1 duiken worden geladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Download klaar - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Download probleem</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Het archief kon niet geopend worden: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Beschadigde download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Het archief kon niet geopend worden: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Upload klaar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Upload mislukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Upload gelukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Login mislukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Kan antwoord niet correct ontleden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Kies Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Verbinden met duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Fout</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Uemis duikcomputer zoeken</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Garmin duikcomputer zoeken</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Onderbreek downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Kies een bestand om duikcomputer log te downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Log bestanden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Kies een bestand voor de duikcomputer binaire dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Dump bestanden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Download opnieuw</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <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> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Downloaden</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth staat uit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Leveranciersnaam:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>USB device</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Duikcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Verbinding:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Scan opnieuw</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Geladen duiken</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Informatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aanvaarden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Alles selecteren</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Selectie ongedaan maken</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Aanmelden bij Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Gebruik het 'Deel via' menu om de verbinding van Subsurface met uw Facebook account te sluiten.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Log in om verbinding met Facebook te maken. Dit maakt het mogelijk om duiken op uw tijdslijn te publiceren</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Facebook succesvol ingelogd</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Fout, onbekende user id, kan niet inloggen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Duik succesvol naar Facebook gestuurd</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Duik naar Facebook sturen mislukt. Zie debug uitvoer en stuur deze naar de Subsurface email lijst</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Alles selecteren</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Selectie ongedaan maken</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Wissel Selectie</translation> </message> @@ -3932,59 +3996,59 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation type="unfinished"/> + <source>Find moved media files</source> + <translation>Vind verplaatste media bestanden</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation type="unfinished"/> + <source>Found media files</source> + <translation>Gevonden media bestanden</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation type="unfinished"/> + <source>Match only media files in selected dive(s)</source> + <translation>Alleen overeenkomstige media in geselecteerde duik(en)</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> <source>Scanning:</source> - <translation type="unfinished"/> + <translation>Scannen:</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> <source>Select folder and scan</source> - <translation type="unfinished"/> + <translation>Selecteer map en scan</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Doorloop mappen met afbeeldingen</translation> + <source>Traverse media directories</source> + <translation>Doorloop mappen met media</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> <source>Stop scanning</source> - <translation type="unfinished"/> + <translation>Scannen stoppen</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation type="unfinished"/> + <translation>Scannen geannuleerd - resultaten kunnen onvolledig zijn</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation type="unfinished"/> + <source>No matching media files found</source> + <translation>Geen overeenkomende media gevonden</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation type="unfinished"/> + <source>Found <b>%1</b> media files at their current place.</source> + <translation><b>%1</b> media bestanden gevonden op hun huidige locatie.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation type="unfinished"/> + <source>Found <b>%1</b> media files at new locations:</source> + <translation><b>%1</b> media bestanden gevonden op nieuwe locaties:</translation> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Locatie:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Locatie</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(gelijke GPS fix)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 verwijderd</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n duik hier)</numerusform><numerusform>, %n duiken hier)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(geen bestaande GPS data, voeg een GPS fix van deze duik toe)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(geen GPS data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Kies duikstek:</translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Locatie niet ingesteld</translation> </message> @@ -4242,8 +4306,8 @@ Bent u zeker?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notities</translation> </message> @@ -4264,19 +4328,19 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Lucht temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -4357,8 +4421,8 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Foto's</translation> + <source>Media</source> + <translation>Media</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ Bent u zeker?</translation> <translation>Gewichtssysteem toevoegen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Lucht temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Deze trip wordt bewerkt.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Meerdere duiken worden bewerkt.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Deze duik wordt bewerkt.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Trip notities</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Trip locatie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nieuwe duikstek</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Wijzigingen niet opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>U staat op het punt wijzigingen te verwijderen</translation> </message> @@ -4470,424 +4534,419 @@ Bent u zeker?</translation> <translation>&Importeren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>Bewerken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Deel via</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Nieuw logboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nieuw</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Logboek &openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> - <translation>Bewaar</translation> + <translation>Op&slaan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Opslaan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> - <translation>Bewaren als</translation> + <translation>Opslaan als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Opslaan als...</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Sluiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Sluiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Voorkeuren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importeren uit &duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>GPS gegevens importeren van Subsurface webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Namen duikcomputers wijzigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Duik toevoegen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>Duik bewerken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Kopieer duikcomponenten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Plak duikcomponenten</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> - <translation>Hernummeren</translation> + <translation>He&rnummeren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Automatisch groeperen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Profiel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Alle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Vorige duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Volgende duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Over Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Handleiding</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Kaart</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Duik plannen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Importeer logbestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importeer logboeken uit andere programma's</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importeren van divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Volledig scherm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Volledig scherm in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Zoek naar updates</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Exporteren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exporteer logboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Duikcomputer configureren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Duik bewerken in de planner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Toon/verberg pO₂ grafiek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Toon/verberg pN₂ grafiek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>pHe grafiek in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Door DC aangegeven plafond in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Berekend plafond in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Berekening van alle compartimenten in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Toon/verberg hartslag</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>MOD in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Meetlat in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Grafiek schalen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Toon/verberg foto's</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Media in-/uitschakelen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>&Vind verplaatste media bestanden</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Toon Gas Bar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Duiklijst filteren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Heat-map tonen/verbergen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Gebruikersenquête</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Ongedaan maken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Vind verplaatste a&fbeeldingen</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Open c&loud opslag</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> - <translation>Bewaar in clo&ud opslag</translation> + <translation>Opslaan in clo&ud opslag</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Manage duikstekken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>B&ewerk duikstek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Cloud opslag online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> - <translation>Verbind met</translation> + <translation>Verbinden met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Verbreek verbinding met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Je probeert duiken samen te voegen met een %1min oppervlakteinterval</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Template backup aangemaakt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4910,214 +4969,214 @@ alleen leesbaar zijn, en deze dienen niet gewerkt te worden, want de applicatie kan deze overschrijven bij opnieuw opstarten.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u online gaat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Er zijn niet bewaarde wijzigingen. Wilt u deze opslaan in de cloud opslag? -Bij antwoord nee, zal de cloud pas gesynchroniseerd worden bij de eerstvolgende "Open cloud opslag" of "Bewaar in cloud opslag".</translation> +Bij antwoord nee, zal de cloud pas gesynchroniseerd worden bij de eerstvolgende "Open cloud opslag" of "Opslaan in cloud opslag".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Cloud opslag online gaan is mislukt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>U probeert een duik te herplannen die geen geplande duik is.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Duiklog bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> - <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation> + <translation>Wilt u de wijzigingen in bestand %1 opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> - <translation>Wilt u de wijzigingen bewaren in het bestand?</translation> + <translation>Wilt u de wijzigingen opslaan in het bestand?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> - <translation>Bestand bewaren als</translation> + <translation>Bestand opslaan als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[locale cache voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[cloud opslag voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Opent een databestand van een oudere versie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>U heeft een databestand van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling. Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Contact opnemen met cloud service...</translation> </message> @@ -5174,7 +5233,7 @@ Mogelijk ontbreken de QML modules QtPositioning en QtLocation!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter toont %1 (van %2) duiken</translation> </message> @@ -5182,12 +5241,12 @@ Mogelijk ontbreken de QML modules QtPositioning en QtLocation!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>U moet de firmware van uw duikcomputer updaten: u heeft versie %1 maar de laatste stabiele versie is %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5196,27 +5255,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een logboek download voordat je verder gaat met de update</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Niet nu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Firmware updaten</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Firmware upgrade mededeling</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Bewaar de firmware als</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware bestanden</translation> </message> @@ -5354,8 +5413,8 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Geen standaard bestand</translation> + <source>&No default file</source> + <translation>&Geen standaard bestand</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5379,6 +5438,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5409,29 +5469,54 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Video thumbnails</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>ffmpeg executable</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Extraheer op positie</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Extraheer video thumbnails</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Alle instellingen wissen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> - <translation>Zet alle voorkeuren terug naar hun originele waarden</translation> + <translation>Zet alle instellingen terug naar hun originele waarden</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Algemeen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Standaard logboek openen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Selecteer ffmpeg executable</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5586,8 +5671,8 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Thumbnails opnieuw berekenen indien ouder dan afbeelding</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Thumbnails opnieuw berekenen indien ouder dan media bestand</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5626,7 +5711,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <translation>Toon gemiddelde diepte in profiel</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profiel</translation> </message> @@ -5705,27 +5790,27 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <translation>Om een nieuwe taal te laden dient u Subsurface te herstarten.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Letterlijke karakters</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Geen bijzondere karakter(s) in tijd formaat. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Geen bijzondere karakter(s) in datum formaat. @@ -5777,7 +5862,7 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface cloud opslag</translation> </message> @@ -5802,73 +5887,58 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Wachtwoord lokaal bewaren?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Standaard gebruikers ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Bewaar gebruikers ID lokaal?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Netwerk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Geen proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Systeem proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Wijziging niet toegepast. Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Wijziging niet toegepast. Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface cloud opslag (rechten gecontroleerd)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface cloud opslag (onjuist wachtwoord)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface cloud opslag (PIN vereist)</translation> </message> @@ -6191,139 +6261,139 @@ Exporteer naar een ander bestand.</translation> <message> <location filename="../desktop-widgets/printoptions.cpp" line="227"/> <source>The template '%1' is read-only and cannot be deleted.</source> - <translation>Het doel sjabloon '%1' is alleen leesbaar en kan niet worden verwijderd.</translation> + <translation>Het sjabloon '%1' is alleen leesbaar en kan niet worden verwijderd.</translation> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 van %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Onbekende duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Gaswissel toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Maak eerste duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Geplande duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Handmatig toegevoegde duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Verwijder deze duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (fles %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Voeg setpoint wissel toe</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Bladwijzer toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> - <translation type="unfinished"/> + <translation>Duik in tweeën splitsen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Duikmodus wijzigen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Profiel bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Gebeurtenis verwijderen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Gelijkaardige gebeurtenissen verbergen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Naam bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> - <translation>Pas drukken aan van cilinder %1 (nu geinterpoleerd als %2)</translation> + <translation>Druk aanpassen van cilinder %1 (nu geïnterpoleerd als %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Toon alle gebeurtenissen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Gebeurtenissen verbergen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Alle %1 gebeurtenissen verbergen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Geselecteerde gebeurtenis verwijderen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Naam bladwijzer bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Naam:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Deze naam is te lang!</translation> </message> @@ -6331,53 +6401,53 @@ Exporteer naar een ander bestand.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Open lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Open lokale duikgegevens mislukt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 duiken geladen uit de lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>werkt met lokale data</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Fout bij het verwerken van de lokale opslag, opgegeven</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Geen cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Voer geldige cloud rechten in</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Ongeldig formaat voor e-mailadres</translation> </message> @@ -6427,51 +6497,51 @@ Exporteer naar een ander bestand.</translation> <translation>Kan niet verbinden met de Subsurface cloud opslag</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud rechten zijn geldig. duiken ophalen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Cloud opslag fout: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Duiken laden uit de lokale opslag ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation> Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Onbekende GPS locatie</translation> </message> @@ -6479,7 +6549,7 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Starten...</translation> </message> @@ -6526,12 +6596,12 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="152"/> <source>Renumber selected dives</source> - <translation>Hernummer geselecteerde duiken</translation> + <translation>Geselecteerde duiken hernummeren</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="154"/> <source>Renumber all dives</source> - <translation>Hernummer alle duiken</translation> + <translation>Alle duiken hernummeren</translation> </message> </context> <context> @@ -6571,116 +6641,126 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Instellingen</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Ongedefinieerd</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Onjuiste email/wachtwoord combinatie</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Rechten moeten nog worden gecontroleerd</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Rechten gecontroleerd</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Geen cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Cloud status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>E-mail</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Niet van toepassing</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Wijzigen</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Thema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blauw</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>normale tekst</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Accent</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Roze</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Donker</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS data webservice</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Afstandsdrempel (meters)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Tijdsdrempel (minuten)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Standaard fles</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Fles:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Ontwikkelaar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Toon ontwikkelaars menu</translation> </message> @@ -6690,12 +6770,12 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/> <source>Shift selected image times</source> - <translation>Geselecteerde tijdsstippen verschuiven</translation> + <translation>Geselecteerde tijdstippen verschuiven</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/> <source>Shift times of image(s) by</source> - <translation>Tijdsstip voor afbeelding(en) verschuiven met</translation> + <translation>Tijdstip voor afbeelding(en) verschuiven met</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="95"/> @@ -6715,15 +6795,15 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Waarschuwing! -Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30 minuten na het eind van enige geselecteerde duik.</translation> +Niet alle media bestanden hebben tijdstippen tussen 30 minuten voor de start en 30 minuten na het eind van enige geselecteerde duik.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Laad afbeeldingen zelfs als de tijd niet overeenkomt met de duik tijd.</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Laad media bestanden zelfs als de tijd niet overeenkomt met de duik tijd.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6746,39 +6826,39 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30 <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Afbeelding openen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Afbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Geselecteerde duik datum/tijd</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Eerste geselecteerde duik datum/tijd</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Laatste geselecteerde duik datum/tijd</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Bestanden met onjuiste datum/tijd</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Geen Exif daum/tijd gevonden</translation> </message> @@ -6788,12 +6868,12 @@ Bestanden met onjuiste datum/tijd</translation> <message> <location filename="../desktop-widgets/shifttimes.ui" line="23"/> <source>Shift selected dive times</source> - <translation>Geselecteerde tijdsstippen verschuiven</translation> + <translation>Geselecteerde tijdstippen verschuiven</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="49"/> <source>Shift times of selected dives by</source> - <translation>Geselecteerde tijdsstippen verschuiven met</translation> + <translation>Geselecteerde tijdstippen verschuiven met</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="72"/> @@ -6871,28 +6951,28 @@ Bestanden met onjuiste datum/tijd</translation> <translation>Importeer berichten (fouten, waarschuwingen, etc)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Open SmartTrak bestanden</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak bestanden</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Open Subsurface bestanden</translation> </message> @@ -6900,64 +6980,64 @@ Bestanden met onjuiste datum/tijd</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Klein</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Gemiddeld</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Datum duik: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duur: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Duiklocatie: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7044,7 +7124,7 @@ Bestanden met onjuiste datum/tijd</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation>Afbeeldingsmaat</translation> + <translation>Afbeeldingsgrootte</translation> </message> </context> <context> @@ -7094,65 +7174,17 @@ Bestanden met onjuiste datum/tijd</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Geef GebruikersID en klik op Download</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Verbinding wordt opgezet.</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Download klaar</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Download fout: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Verbindingsfout:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Ongeldige gebruikersidentificatie</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Kan antwoord niet parsen!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Laden succesvol voltooid</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Duikpakken:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Geen duikpak geselecteerd</translation> </message> @@ -7283,39 +7315,44 @@ Bestanden met onjuiste datum/tijd</translation> <translation>Zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Laad foto('s) van bestand(en)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Laad foto('s) van het web</translation> + <source>Load media from file(s)</source> + <translation>Laad media van bestand(en)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Verwijder geselecteerde afbeeldingen</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Laad media bestand(en) van het web</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Verwijder alle afbeeldingen</translation> + <source>Delete selected media files</source> + <translation>Verwijder geselecteerde media bestanden</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Verwijder alle media bestanden</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Open map van geselecteerde media bestanden</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> - <translation>Geselecteerde thumsnails opnieuw berekenen</translation> + <translation>Geselecteerde thumbnails opnieuw berekenen</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Afbeeldingen worden verwijderd</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>Media bestanden worden verwijderd</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Weet je zeker dat je alle afbeeldingen wilt verwijderen?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Weet je zeker dat je alle media bestanden wilt verwijderen?</translation> </message> </context> <context> @@ -7483,15 +7520,15 @@ worden uit lucht en: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Trefwoorden:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Trefwoorden</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Lege trefwoorden</translation> </message> @@ -7690,7 +7727,7 @@ worden uit lucht en: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1klik om te bezoeken %2</translation> </message> @@ -7714,130 +7751,135 @@ worden uit lucht en: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 getoond)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Trefwoorden</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Media voor/gedurende/na duik</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Foto's voor/gedurende/na duik</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -7851,81 +7893,81 @@ worden uit lucht en: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Geef URL voor afbeeldingen</translation> + <source>Enter URL for media files</source> + <translation>Geef URL voor media bestanden</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Zoek naar updates.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kon niet zoeken naar updates.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>De volgende fout trad op:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Controleer uw internetverbinding.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>U gebruikt de meest recente versie van Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Er is een nieuwe versie van Subsurface beschikbaar.<br/>Klik op:<br/><a href="%1">%1</a><br/> om te downloaden.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Er is een nieuwe versie van Subsurface beschikbaar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>De nieuwste versie is %1, kijk %2 op onze download pagina %3 voor informatie over de update.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>De nieuwste officiele versie is</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>De server gaf het volgende antwoord:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface controleert iedere 2 weken of er een nieuwe versie beschikbaar is. Als je dit niet wilt, selecteer Weiger.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Weigeren</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Aanvaarden</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automatisch controleren of er updates zijn</translation> </message> @@ -8101,6 +8143,19 @@ Taal: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>ffmpeg opstarten gefaald - aanmaken video thumbnail gestaakt</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>wacht op ffmpeg gefaald - aanmaken video thumbnail gestaakt</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8156,12 +8211,12 @@ Taal: %1</translation> <translation>Uploaden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Operatie duurt te lang</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Gegevens worden overgebracht...</translation> </message> @@ -8187,8 +8242,8 @@ Taal: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Geen fout</translation> </message> @@ -8312,7 +8367,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Fout bij het verwerken van de header</translation> </message> @@ -8649,9 +8704,9 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>zuurstof</translation> </message> @@ -8666,131 +8721,131 @@ Maximum</translation> <translation>Open circuit</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>lucht</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>Geïntegreerd</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>riem</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>enkel</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8867,123 +8922,123 @@ Maximum</translation> <translation>Geen duikprofiel voor '%s' gevonden</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Checkout uit opslag (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Ophalen uit opslag (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Verplaatsen naar opslag (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> - <translation>Lokale cache directorie %s is corrupt - kan niet synchoniseren met de Subsurface cloud opslag</translation> + <translation>Lokale cache map %s is corrupt - kan niet synchroniseren met de Subsurface cloud opslag</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Kan de lokale cache niet aanpassen naar nieuwere data in de Sursurface cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface cloud opslag corrupt</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Kan de Subsurface cloud opslag niet actualiseren, probeer later opnieuw</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> - <translation>Cloud en lokale data verschillen teveel. Fout: samenvoegen gefaald (%s)</translation> + <translation>Cloud en lokale data verschillen teveel. Fout: samenvoegen mislukt (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Cloud en lokale data verschillen teveel. Kan de verschillen niet samenvoegen</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Cloud en lokale data verschillen teveel.</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> - <translation>Cloud en lokale data verschillen teveel. Fout: wegschrijven data gefaald (%s)</translation> + <translation>Cloud en lokale data verschillen teveel. Fout: wegschrijven data mislukt (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemen met lokale cache van de Subsurface cloud data</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Verplaatste cache data naar %s. Probeer de operatie opnieuw.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Lokale opslag synchroniseren met cloud opslag</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Lokale wijzigingen naar cloud opslag verplaatsen</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Probeer lokale wijzigingen in cloud opslag samen te voegen</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Data in cloud opslag oplaan</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sync met cloud opslag</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Kan cloud server niet bereiken, werken met lokale data</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Verbinden met cloud gelukt, wijzigingen ophalen</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Synchroniseren met cloud gereed</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Kan niet verbinden met de Subsurface cloud opslag</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> - <translation>git clone van %s gefaald (%s)</translation> + <translation>git clone van %s mislukt (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Data bestand synchroniseren</translation> </message> @@ -9082,119 +9137,119 @@ Maximum</translation> <translation>ongeldig event-nummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Fout bij verwerken van de datum en tijd</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Duik nr. %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Fout bij verwerken van de duikduur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Fout bij het verwerken van de maximum duikdiepte</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Fout bij het verwerken van de temperatuur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Fout bij het verwerken van het aantal gasmengsels</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Fout bij het verkrijgen van het zoutgehalte</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Fout bij bekomen van oppervlaktedruk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Fout bij bepalen duikmodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Fout bij het verwerken van het gasmengsel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Kan geen parser creëren voor %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Fout bij het registreren van de data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Duik al gedownload op %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serienummer=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Fout bij openen van device %s %s (%s). Vaak is het, om software fouten te vinden, nuttig om een libdivecomputer log bestand te sturen aan de ontwikkelaars. Deze log kan in het "Over" scherm naar het plakbord worden gekopieerd.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9203,13 +9258,13 @@ Vaak is het, om software fouten te vinden, nuttig om een libdivecomputer log bes Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeveld.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Geen nieuwe duiken uit duikcomputer geladen</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>meedere GPS locaties voor deze duikstek; ook %s @@ -9217,19 +9272,19 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>extra naam voor duikstek: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Duiken laden uit lokale cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Duik data openen gelukt</translation> </message> @@ -9252,12 +9307,12 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Fout bij analyse van '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -9288,8 +9343,8 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>, effectieve GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>SP wijziging</translation> </message> @@ -9528,7 +9583,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <message> <location filename="../core/plannernotes.c" line="510"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> - <translation>vereist minimum gas voor de opstijging is al meer dan de begindruk van de cilinder!</translation> + <translation>vereist minimum gas voor de opstijging is al meer dan de begindruk van de duikfles!</translation> </message> <message> <location filename="../core/plannernotes.c" line="515"/> @@ -9551,17 +9606,17 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>lage pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Gas %s kan niet gevonden worden</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>EAN</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9570,84 +9625,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9656,7 +9711,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9665,175 +9720,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Dichtheid: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Veiligheidsstop: onbekende tijd @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: onbekende tijd @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Compartiment %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD in leidende weefsel </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>gemiddelde diepte tot nu toe %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9882,142 +9937,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>meer dan %1 dagen</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n duik)</numerusform><numerusform>(%n duiken)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>ZUURSTOF</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Kan het bestand %s niet openen</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Lucht temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Duiken</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Alles uitklappen</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Alles inklappen</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Trips</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistieken</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Geavanceerd zoeken</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Zicht</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Duikleider</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Pak</translation> </message> @@ -10028,180 +10083,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Trefwoorden</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notities</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Toon meer details</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Jaar</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Totale tijd</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Gemiddelde tijd</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Kortste tijd</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Langste tijd</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Gemiddelde diepte</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. diepte</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max. diepte</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Gemiddeld gasverbruik</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Gemiddelde temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Terugkeren naar de lijst</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Duik #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Duikprofiel</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Duikinformatie</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Duikuitrusting</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Grootte</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Werkdruk</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Startdruk</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Einddruk</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Gebeurtenissen</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Naam</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Waarde</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coördinaten</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Duikstatus</translation> </message> @@ -10231,62 +10286,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Alle (bij trip statistiek)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>mei</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>sept</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>dec</translation> </message> @@ -10537,12 +10592,17 @@ Is de Uemis Zurich correct aangesloten?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>Kan map 'theme' niet vinden in de standaard locaties</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. diepte:</translation> @@ -10568,77 +10628,77 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Notities:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Gebouwd</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Gezonken</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Tijdstip gezonken</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Reden</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationaliteit</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Scheepswerf</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Scheepstype</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Lengte</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Breedte</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Diepgang</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Waterverplaatsing</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Vracht</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Wrak Data</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Hoogte</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Diepte</translation> </message> @@ -10683,27 +10743,27 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Stad</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Opslaan data gestart</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Opslaan duiken gestart</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Lokale cache aangemaakt</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Voorbereiden data opslag</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>Duikmodus wijziging</translation> </message> @@ -10718,7 +10778,7 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Dit punt verwijderen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Bewaar geen lege duiklog in de cloud</translation> </message> @@ -10738,24 +10798,24 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Grootste</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Ongeldig antwoord van de server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML etiket 'DiveDateReader' werd verwacht, maar kreeg '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Verwacht XML etiket 'DiveDates' werd niet gevonden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> - <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation> + <translation>Slecht gevormd XML antwoord. Regel %1: %2</translation> </message> </context> <context> @@ -10766,112 +10826,102 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Beheer duiken</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Automatische cloud synchronisatie uitzetten </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Automatische cloud synchronisatie aanzetten </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Zet locatie service uit</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Instellingen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Handmatig duik toevoegen</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Download uit DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Handmatig synchroniseren met cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Door automatische synchronisatie uit te zetten, wordt de data alleen lokaal opgeslagen. Dit kan nuttig zijn op plekken zonder mobiele data. Door "Handmatig met de cloud synchroniseren", wordt de data alsnog met de cloud gesynchroniseerd.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Upload GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Pas GPS fixes toe</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>GPS data downloaden</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Toon GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Maak GPS cache leeg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Ontwikkelaar</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App log</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Thema informatie</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Over</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Draai locatie service</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 45ff87a62..ead4edddb 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -163,160 +163,160 @@ <translation>Trwa skanowanie w poszukiwaniu zdalnych urządzeń...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Skanowanie zakończone pomyślnie.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Lokalne urządzenie Bluetooth zostało %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>włączone</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>wyłączone</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Stan: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Urządzenie %1 może zostać użyte. Możesz wcisnąć przycisk Zapisz.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Urządzenie %1 musi zostać sparowane przed użyciem. Użyj menu kontekstowego. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Lokalne urządzenie zostało zmienione.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Połącz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Rozłącz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Próbuję sparować urządzenie %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Próbuję rozłączyć urządzenie %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Urządzenie %1 zostało odłączone.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Urządzenie %1 zostało sparowane.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Urządzenie %1 zostało sparowane i zautoryzowane.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Urządzenie %1 może zostać użyte do połączenia. Możesz wcisnać przycisk Zapisz.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Błąd lokalnego urządzenia: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Błąd parowania. Jeśli urządzenie wymaga podania kodu PIN spróbuj je sparować przy pomocy systemu operacyjnego.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Nieznany błąd.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Adapter Bluetooth jest wyłączony, włącz go przed rozpoczęciem wykrywania urządzeń.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Zapis lub odczyt z urządzenia zakończył się błędem.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Natrafiono na nieznany błąd.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Błąd wykrywania urządzeń: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Niedostępne</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Nie można użyć lokalnego adaptera Bluetooth.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Agent wykrywania urządzeń nie został utworzony, bo adres %1 nie odpowiada fizycznemu adresowi żadnego lokalnego urządzania Bluetooth. </translation> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Osoba:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Wyszukiwanie partnerów i divemasterów</translation> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>brak partnerów</translation> </message> @@ -1658,102 +1658,102 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Tworzy kopię ustawień komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Błąd kopii zapasowej XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Pomyślnie utworzono kopię zapasową.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Twoje ustawienia zostały zapisane do: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Przywraca ustawienia komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Błąd przywracania XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Pomyślnie przywrócono ustawienia</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Wybierz plik z aktualizacją</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1969,22 +1969,22 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Usuń nurkowanie</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1992,103 +1992,135 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Miejsce:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Głębokość:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Długość:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temp. powietrza:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temp. wody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Waga:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Ocena:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notatki:</translation> </message> @@ -2257,104 +2289,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Zwiń pozostałe</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Dodaj nurkowanie(a) do grupy powyżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Dodaj nurkowanie(a) do grupy poniżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Połącz grupę z grupą powyżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Usuń nurkowanie(a)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Połącz wybrane nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Zmień czas nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Podziel wybrane nurkowanie(a)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Dodaj zdjęcia z dysku</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Dodawanie zdjęć</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2555,7 +2602,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Światło</translation> </message> @@ -2565,121 +2612,121 @@ GPS location:</source> <translation>Piasek</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Format używany do wymiany danych pomiędzy różnorodnymi programami związanymi z nurkowaniem.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Lista oddzielonych przecinkami danych opisujących profil nurkowania. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Lista oddzielonych przecinkami najważniejszych informacji z nurkowania. Nie obejmuje to profilu nurkowania.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Wysyła dane na stronę divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Eksport danych o miejscach nurkowych w HTML z zaznaczeniem ich na mapie świata. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Format XML używany przez Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Zapisuje głębokości zdjęć do pliku.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Eksportuj plik UDDF jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Eksportuj plik CSV jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Eksport mapy świata</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Eksport Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Zapisz głębokości zdjeć</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Eksportuj pliki HTML jako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Poczekaj proszę, trwa eksportowanie..</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Nie można otworzyć pliku %s</translation> </message> @@ -3039,62 +3086,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Głębokość końcowa</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Rodzaj</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3299,261 +3346,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>Nr</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Butla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Zdjęcia</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Kraj</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Partner</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Głębokość(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Balast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>nie wybrano żadnych nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>nie udało się utworzyć pliku zip do wysłania: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>błąd wewnętrzny</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Zakończ</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Wysyłanie listy nurkowań...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Pobieranie listy nurkowań...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Pobieranie %1 nurkowań...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Zakończono pobieranie - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problem z pobieraniem</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Nie udało się otworzyć archiwum: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Pobrano uskodzone dane</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Archiwum nie mogło zostać otworzone: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Wysyłanie zakończone</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Wysyłanie nieudane</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Wysyłanie zakończone sukcesem</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Błąd logowania</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Nie można przetworzyć odpowiedzi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> @@ -3561,23 +3614,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Pobierz</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Wybierz tryb pobierania Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Błąd</translation> </message> @@ -3587,42 +3640,47 @@ p, li { white-space: pre-wrap; } <translation>Wykryj komputer Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <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> @@ -3694,9 +3752,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Pobierz</translation> </message> @@ -3722,7 +3780,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -3737,57 +3795,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Ponów</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Wyjście</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Zatwierdź</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Wybierz wszystko</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3818,12 +3882,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Zaloguj się, aby połączyć się z Facebookiem. Pozwoli to Subsurface publikować nurkowania na Twojej osi czasu.</translation> </message> @@ -3831,22 +3895,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3862,17 +3926,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Wybierz wszystko</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3927,17 +3991,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3953,8 +4017,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Katalogi zdjęć do przejrzenia</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3968,17 +4032,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4071,40 +4135,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Miejsce:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Miejsce</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(ta sama lokalizacja)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (oddalone o ~%1 </translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(brak pozycji GPS, dodaj lokalizację tego nurkowania)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(brak lokalizacji)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Wybierz miejsce:</translation> </message> @@ -4112,7 +4176,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>nie podano miejsca</translation> </message> @@ -4237,8 +4301,8 @@ Czy na pewno kontynuować?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Opis</translation> </message> @@ -4259,19 +4323,19 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temp. powietrza</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temp. wody</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -4352,8 +4416,8 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Zdjęcia</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4386,53 +4450,53 @@ Czy na pewno kontynuować?</translation> <translation>Dodaj balast</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temp. powietrza [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temp. wody [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Opis nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Miejsce nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Nowe miejsce nurkowe</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Porzucić zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Masz zamiar porzucić zmiany.</translation> </message> @@ -4465,424 +4529,419 @@ Czy na pewno kontynuować?</translation> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>Edytuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Publikuj na</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>Nowy logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nowy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Otwórz logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Otwórz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Zapisz jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Zapisz jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Zamknij</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Zamknij</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Drukuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Wyjdź</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importuj z komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importuj dane GPS z usługi sieciowej Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Edycja nazw komputerów nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Dodaj nurkowanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>Edytuj nurkowanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Kopiuj parametry nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Wklej parametry nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Automatycznie grupuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Lista nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Wszystko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Poprzedni komputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Następny komputer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Instrukcja obsługi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Zaplanuj nurkowanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Importowanie logów nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importuj logi z innej aplikacji</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importuj z divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Pełen ekran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Przełącz pełen ekran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Sprawdź aktualizacje</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Eksport</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Eksport nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Konfiguruj komputer nurkowy</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Edytuj w planerze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Pokazuj wykres pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Pokazuj wykres pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Pokazuj wykres pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Pokazuj sufit z komputera nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Pokazuj obliczony sufit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Obliczenia dla wszystkich tkanek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Pokazuj obliczony sufit z krokiem 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Pokazuj tętno</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Pokazuj MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Pokazuj EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Pokazuj NDL / TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Pokazuj SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Pokazuj linijkę</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Skalowanie wykresu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Pokazuj zdjęcia</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Filtrowanie nurkowań</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Ankieta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Cofnij</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Ponów</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Znajdź przeniesione zdjecia</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Otwórz dane z chmury</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Zapisz do chmury</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Zarządzaj miejscami nurkowymi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Edycja miejsc nurkowych</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4896,213 +4955,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Próba zmiany planu nurkowania, które nie zostało utworzone przez planer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Czy chcesz zapisać wprowadzone zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[zapis w chmurze dla] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Otwarto plik ze starszej wersji</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Otworzony plik pochodzi ze starszej wersji Subsurface. Zalecamy zapoznać się z instrukcją i opisanymi tam zmianami w najnowszej wersji programu, szczególnie z nowym sposobem zarządzania miejscami nurkowymi. Subsurface zaimportował informacje o miejscach nurkowych, ale może warto poświęcić chwilę na przejrzenia tych danych i upewnienie się, że wszytko wygląda poprawnie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Łączenie się z chmurą...</translation> </message> @@ -5158,7 +5217,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filtr pokazuje %1 (z %2) nurkowań</translation> </message> @@ -5166,39 +5225,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Możesz zaktualizować oprogramowanie w swoim komputerze nurkowym: masz wersję %1 a najnowsza stabilna wersja to %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Nie teraz</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Aktualizuj oprogramowanie</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Informacja o aktualizacji oprogramowania</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Zapisz pobrany firmware jako</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5336,8 +5395,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Brak domyślnego pliku</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5361,6 +5420,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5391,29 +5451,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Kasowanie ustawień</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Przywróć wszystkie ustawienia do ich wartości domyślnych </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Otwórz domyślny plik</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5568,7 +5653,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5608,7 +5693,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5687,25 +5772,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5756,7 +5841,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Pzechowywanie danych w chmurze</translation> </message> @@ -5781,73 +5866,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Zapisywać hasło lokalnie?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Usługa Internetowa Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Domyślne ID Użytkownika</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Zapisywać ID użytkownika do pliku?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Sieć</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Bez proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Systemowe proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Adres email i hasło do przechowywania danych w chmurze może zawierać jedynie litery, cyfry oraz znaki '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Przechowywanie danych w chmurze (uwierzytelniony)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6175,133 +6245,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Nieznany komputer nurkowy</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Dodaj notatkę</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Edytuj profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Usuń znacznik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Ukryj podobne znaczniki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Odkryj wszystkie znaczniki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ukrywanie wydarzeń</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Ukyć wszystkie wydarzenia typu %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Usunąć wybrane wydarzenie?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Zmień nazwę wydarzenia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Własna nazwa:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Nazwa jest za długa!</translation> </message> @@ -6309,53 +6379,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Adres email i hasło do przechowywania danych w chmurze może zawierać jedynie litery, cyfry oraz znaki '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6405,50 +6475,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6456,7 +6526,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6548,116 +6618,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Motyw</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Niebieska</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Domyślna butla</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6692,16 +6772,14 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Uwaga! -Nie wszystkie zdjęcia mają czas w zakresie pomiędzy -30 minut przed rozpoczęciem a 30 minut po zakończeniu wybranych nurkowań.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Załaduj zdjęcia nawet jeśli czas nie pasuje do nurkowań</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6724,38 +6802,38 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy <translation>Jaka data i godzina jest na zdjęciu?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Otwórz zdjęcie</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6848,28 +6926,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6877,64 +6955,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Średnia</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data nurkowania: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Czas: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Miejsce nurkowania: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7071,65 +7149,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Podaj ID użytkownika i wciśnij Pobierz</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Usługa Internetowa</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Łączenie...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Pobieranie zakończone</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Błąd pobierania: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Błąd połączenia:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Niepoprawny identyfikator użytkownika!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Nie można przetworzyć odpowiedzi!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Pobieranie zakończone sukcesem</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Skafandry:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>nie podano skafandra</translation> </message> @@ -7260,38 +7290,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Dodaj zdjęcia z dysku</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Dodaj zdjęcia z Internetu</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7461,15 +7496,15 @@ z powietrza przy użyciu: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Tagi:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Tagi</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>brak tagów</translation> </message> @@ -7668,7 +7703,7 @@ z powietrza przy użyciu: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7692,130 +7727,135 @@ z powietrza przy użyciu: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation> (%1 pokazane)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>Nr</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Głębokość(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Butla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Partner</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Balast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Kraj</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -7829,80 +7869,80 @@ z powietrza przy użyciu: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Podaj adres URL zdjęć</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Sprawdzanie dostępności aktualizacji.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Nie udało się sprawdzić dostępności aktualizacji.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Natrafiono na następujący błąd:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Sprawdź proszę swoje połączenie z Internetem.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Używasz najnowszej wersji Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Nowa wersja Subsurface jest dostępna.<br/>Kliknij na:<br/><a href="%1">%1</a><br/> aby ją pobrać.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Nowsza wersja Subsurface jest dostępna.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Najnowsza wersja to %1, informacje jak zaktualizować aplikację znajdziesz na %2 naszej stronie %3</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Najnowsza wersja to </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Serwer zwrócił następującą informację:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Przestań</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Zatwierdź</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Automatyczne sprawdzanie aktualizacji </translation> </message> @@ -8078,6 +8118,19 @@ Język: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8133,12 +8186,12 @@ Język: %1</translation> <translation>Wyślij</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Przekroczony czas</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Transfer danych...</translation> </message> @@ -8164,8 +8217,8 @@ Język: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Bez błędu</translation> </message> @@ -8284,7 +8337,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Błąd podczas przetwarzania nagłówka</translation> </message> @@ -8620,9 +8673,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>tlen</translation> </message> @@ -8637,131 +8690,131 @@ Maximum</source> <translation>Obieg otwarty</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>powietrze</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>zintegrowany</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>pas balastowy</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>na kostkach</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>doczepiany</translation> </message> @@ -8838,123 +8891,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Lokalny katalog podręczny %s został uszkodzony - nie można zsynchronizować się z chmurą</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Nie można zaktualizować zdalnych danych lokalnymi - zdalne dane są nowsze.</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Dane w chmurze zostały uszkodzone</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Nie można zaktualizować danych w chmurze Subsurface, spróbuj później.</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Dane zdalne i dane lokalne utraciły synchronizację. Nie udało się ich scalić (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Dane zdalne i dane lokalne rozeszły się. Nie można połączyć zdalnych i lokalnych zmian.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Dane zdalne i dane lokalne rozeszły się</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Dane zdalne i dane lokalne rozeszły się. Błąd przy zapisywaniu danych (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problem z lokalną pamięcią podręczna danych z chmury</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Pamięć podręczna przeniesiona do %s. Spróbuj ponownie.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Nie udało się połączyć z chmurą Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Nieudana operacja git clone dla %s (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9053,131 +9106,131 @@ Maximum</source> <translation>niepoprawny znacznik</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Błąd podczas przetwarzania daty i czasu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Nurkowanie %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Błąd podczas przetwarzania czasu nurkowania</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Błąd podczas przetwarzania głębokości</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Błąd przy przetwarzaniu temperatury</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Błąd podczas przetwarzania danych o zasoleniu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nie udało się utworzyć parsera dla %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Błąd podczas przetwarzania danych</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>jest kilka lokalizacji GPS dla tego miejsca; także %s @@ -9185,19 +9238,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>dodatkowa nazwa dla miejsca: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9220,12 +9273,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Nie udało się przetworzyć '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> @@ -9256,8 +9309,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9519,17 +9572,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>niska wartość pO₂ %.2f o %d:%02u gaz %s na głębokości %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9538,114 +9591,114 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>dekompresja @@ -9653,145 +9706,145 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (obliczone) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>dekompresja (obliczone) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Obliczony sufit: %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tkanka %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>gł. średnia do teraz %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sGł:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sGł:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9840,142 +9893,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>POWIETRZE</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>TLEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Nie można otworzyć pliku %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Numer</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temp. powietrza</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temp. wody</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Nurkowania</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Grupy</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statystyka</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Wyszukiwanie zaawansowane</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Widzialność</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Partner</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Skafander</translation> </message> @@ -9986,180 +10039,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notatki</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Pokaż więcej szczegółów</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Rok</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Całkowity czas</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Średnia długość</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Najmniejsza długość</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Największa długość</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Średnia głębokość</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min głębokość </translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Maks. głębokość</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Średni SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Średnia temperatura </translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Powrót do listy</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Nurkowanie nr</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Profil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informacje</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Wyposażenie</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Rodzaj</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Pojemność</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Ciśnienie robocze</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Ciśnienie początkowe</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Ciśnienie końcowe</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Zdarzenia</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nazwa</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Wartość</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Współrzędne</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Status nurkowania</translation> </message> @@ -10189,62 +10242,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Sty</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Lut</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Kwi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Cze</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Lip</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Sie</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Wrz</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Paź</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Gru</translation> </message> @@ -10495,12 +10548,17 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Maks. głębokość:</translation> @@ -10526,77 +10584,77 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Notatki:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Wysokość</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Głębokość</translation> </message> @@ -10641,27 +10699,27 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Miasto</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10676,7 +10734,7 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Usuń ten punkt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10696,22 +10754,22 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>max.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Niepoprawna odpowiedź z serwera</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Oczekiwano tagu XML 'DiveDateReader', zamiast tego odczytano '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Oczekiwany tag XML 'DiveDates' nie został znaleziony</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Uszkodzona odpowiedź XML. Linia %1: %2</translation> </message> @@ -10721,115 +10779,105 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="15"/> <source>Subsurface-mobile</source> - <translation type="unfinished"/> + <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 54da4dc04..ce136dcae 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -167,160 +167,160 @@ <translation>Buscando dispositivos remotos...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Busca terminou com sucesso.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>O dispositivo Bluetooth local era %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>ligado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>desligado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>NÃO PAREADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>PAREADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>PAREAMENTO_AUTORIZADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Estado: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>O dispositivo %1 pode ser usado para conexão. Você pode apertar o botão Salvar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>O dispositivo %1 precisa ser pareado para poder ser usado. Por favor use o menu auxiliar para acessar as opções de pareamento.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>O dispositivo precisa de um endereço válido para conexão</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>O dispositivo local foi trocado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Parear</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Desparear</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Tentando parear com o dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Tentando desparear com o dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Dispositivo %1 despareado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Dispositivo %1 pareado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Dispositivo %1 pareado e autorizado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>O dispositivo %1 já pode ser usado para conexões. Você pode apertar o botão Salvar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Erro do dispositivo local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Erro de pareamento. Se o dispositivo remoto exige um PIN personalizado, tente fazer o pareamento através de seu sistema operacional.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Erro desconhecido.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>O adaptador Bluetooth está desligado. Ligue-o antes de fazer a busca.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Escrevendo ou lendo do dispositivo produziu um erro.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Ocorreu um erro desconhecido.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Erro na busca de dispositivo: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Não disponível</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>O adaptador Bluetooth local não pode ser acessado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>O agente de busca de dispositivos não foi criado porque o endereço %1 não corresponde ao endereço físico do dispositivo de nenhum dispositivo Bluetooth.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Pessoa:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation>Pessoa</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Buscas por duplas e divemasters</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Sem dupla</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Fazer backup das configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Arquivos de backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Erro no XML de backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Um erro ocorreu durante a escrita do arquivo de backup. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup bem sucedido</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Suas configurações foram gravadas em: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Restaurar configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Erro ao restaurar XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocorreu um erro durante o restauro do arquivo de backup. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Restauro bem sucedido</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Suas configurações foram restauradas com sucesso.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Escolha o arquivo de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Todos arquivos</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Arquivos de log</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Conectando ao dispositivo...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Conectado ao dispositivo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Desconectado do dispositivo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation> </message> @@ -1973,22 +1973,22 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Detalhes do mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Remover mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Cancelar edição</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Mostrar no mapa</translation> </message> @@ -1996,104 +1996,136 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Mergulho %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Localidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordenadas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Use atual Localização GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Profundidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Duração:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temperatura do ar:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temperatura da água:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Roupa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Cilindro:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Cilindro 1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Mistura gasosa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Pressão inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Pressão final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Cilindro 2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Cilindro 3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Cilindro 4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Cilindro 5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Classificação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibilidade</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notas:</translation> </message> @@ -2262,104 +2294,119 @@ Localização GPS:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Esconder todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Esconder outros</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulhos de viagem</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Criar viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulhos para a viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulhos para viagem abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Juntar viagem com viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Juntar viagem com viagem abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Apagar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marcar megulho(s) como inválidos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Juntar mergulhos selecionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Deslocar tempo dos mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Dividir mergulhos selecionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Carregar imagem(s) do(s) arquivo(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Carregar imagem da web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Arquivos de imagem (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Abrir arquivos de multimídia</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 não parece ser uma imagem</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Arquivos de multimídia</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Arquivos de imagem</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Abrir imagens</translation> + <source>Video files</source> + <translation>Arquivos de vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Todos arquivos</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 não parece ser uma imagem</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ Localização GPS:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Leve</translation> </message> @@ -2570,121 +2617,121 @@ Localização GPS:</translation> <translation>Areia</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Formato genérico que é utilizado para troca de dados em uma variedade de programas de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valores separados por virgulas descrevendo o perfil do mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valores separados por vírgulas das informações do mergulho. Incluem a maior parte dos dados de mergulho mas não informações sobre o perfil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Enviar os dados para o site do divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Enviar dados de mergulho para dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exportação HTML de pontos de mergulho visualizados no mundo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Formato nativo do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Gravar as profundidades das imagens para um arquivo.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Exportar o mergulho como macros TeX para o arquivo.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exportar arquivo UDDF como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>Arquivos UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>Arquivos CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>Arquivos HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Arquivos subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>Arquivos TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exportar arquivo CSV como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exportar mapa do mundo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportar XML do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Gravar profundidades das imagens</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exportar para arquivo TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exportar arquivo HTML como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Favor aguardar, exportando...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Não é possivel abrir o arquivo %s</translation> </message> @@ -3044,62 +3091,62 @@ Localização GPS:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>cil.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Modo de mergulho</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Tempo das paradas</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>CNS Máximo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotos</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Multimídia</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Parceiro</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotos antes/durante/depois do mergulho</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Multimídia antes/durante/depois do mergulho</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>nenhum mergulho selecionado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>não foi possível encontrar a folha de estilos para exportar para divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>falha ao criar arquivo zip para upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>erro interno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Conversão do mergulho %1 para formado do divelogs.de falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>erro na escrita do arquivo zip: %s erro zip %d erro de sistema %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Finalizado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Enviando lista de mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Recebendo lista de mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Recebendo %1 mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Recebimento terminado - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problema com transferência</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>O arquivo não pôde ser aberto: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Recebimento inválido</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>O arquivo não pode ser aberto: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Enviado finalizado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Envio falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Envio bem sucedido</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Abertura de sessão (login) falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Falha na análise da resposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Baixar</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Selecione o modo de transferência Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Conectando ao computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Erro</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Encontrar computador de mergulho Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Encontrar computador de mergulho Garmin</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Cancelar transferência</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Arquivos de log</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Escolha o arquivo onde gravar a saída binária do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Arquivo de dump (Registos da memória do computador de mergulho)</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Tentar download novamente</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Ao salvar a saída da biblioteca libdivecomputer as informações dos mergulhos recebidos NÃO serão gravadas na lista de mergulhos.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Baixar</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth não está habilitado</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Nome do fabricante:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>Dispositivo USB</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Computador de mergulho:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Conexão:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Encerrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Procurar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Mergulhos baixados</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Selecionar tudo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Desfazer seleções</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Conectar ao Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Para remover o Subsurface da sua conta do Facebook, use o menu 'Compartilhar'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Para conectar ao Facebook, por favor entrar. Isso permite ao Subsurface publicar os mergulhos na sua linha do tempo.</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Logado ao Facebook com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Erro, usuário desconhecido, não foi possível logar.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Mergulho enviado com sucesso ao Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>O envio do carregamento falhou. Por favor reveja a mensagem e envie-a para a lista de email do Subsurface</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Selecionar tudo</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Desfazer seleções</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inverter seleção</translation> </message> @@ -3932,18 +3996,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Encontrar imagens que foram movidas</translation> + <source>Find moved media files</source> + <translation>Encontrar arquivos multimídia movidos</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Imagens encontradas</translation> + <source>Found media files</source> + <translation>Arquivos multimídia encontrados</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Fazer a correspondência de imagens somente nos mergulhos selecionados</translation> + <source>Match only media files in selected dive(s)</source> + <translation>Fazer a correspondência de arquivos multimídia somente nos mergulhos selecionados</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3958,8 +4022,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Examinar diretório de imagens</translation> + <source>Traverse media directories</source> + <translation>Examinar diretório de multimídia</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3973,18 +4037,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>Não foram encontradas imagens</translation> + <source>No matching media files found</source> + <translation>Não foram encontradas arquivos multimídia</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>Encontradas <b>%1</b> imagens na sua localização atual.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation>Encontrado <b>%1</b> arquivos multimídia na sua localização atual.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>Encontradas <b>%1</b> imagens em novas localizações:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation>Encontradas <b>%1</b> arquivos multimídia em novas localizações:</translation> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Localização:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Local</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(mesma posição GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 ausente</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n mergulho(s) aqui)</numerusform><numerusform>, %n mergulho(s) aqui)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(sem posição GPS. Adicionar posição GPS a partir deste mergulho)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(sem dados de GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Escolher local:</translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Sem localização definida</translation> </message> @@ -4242,8 +4306,8 @@ Tem certeza que quer continuar?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -4264,19 +4328,19 @@ Tem certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temperatura do ar</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temperatura da água</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Local</translation> </message> @@ -4357,8 +4421,8 @@ Tem certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotos</translation> + <source>Media</source> + <translation>Mídia</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ Tem certeza que quer continuar?</translation> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temperatura do Ar [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temperatura da água [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Esta viagem está sendo editada.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Vários mergulhos estão sendo editados.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Este mergulho está sendo editado.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Notas da viagem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Local do mergulho</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Novo ponto de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Descartar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Você está prestes a eliminar suas alterações.</translation> </message> @@ -4470,424 +4534,419 @@ Tem certeza que quer continuar?</translation> <translation>&Importar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Compartilhar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Salvar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Salvar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Sal&var como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Salvar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Fe&char</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Fechar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Imprimir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&referências</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Fechar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importar do &computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importar dados de &GPS pelo web service do Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Editar &nomes dos dispositivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Adicionar mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Editar mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copiar componentes do mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Colar com&ponentes do mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>A&grupar automáticamente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Estatísticas Anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Lista de Mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Informações</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Todos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Computador de mergulho anterio&r</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>Próximo Computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Sobre o Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manual do usuário</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Mapa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Planejador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Importar arquivos de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importar arquivos de mergulho de outros programas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importar de &divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&F Tela Cheia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Alternar em Tela Cheia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Buscar atualizações</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exportar logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configurar &computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>E&ditar mergulho no planejador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Alternar gráfico pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Alternar gráfico pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Alterna gráfico pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Alterna teto calculado pelo computador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Alterna teto calculado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Alterna calcular todos os tecidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Alterna teto calculado com incrementos de 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Alterna batimentos cardiacos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>alterna MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Alterna EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Alterna NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>alterna taxa SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Anternar visualização da régua</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Escala do gráfico</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Alternar fotos</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Ligar/desligar multimídia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>&Encontrar arquivos multimídia movidos</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Alternar barra de gases</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrar lista de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Alternar mapa de tecidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>&Questionário ao usuário</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Reverter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Refazer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Encontrar imagens movidas</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Abrir armazenamento &remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Salvar no armazenamento rem&oto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Gerenciar pontos de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Editar pontos de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Armazenamento na nuvem online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Conectar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Desconectar de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Tentando juntar mergulhos com %1min de intervalo entre eles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Criada cópia de segurança do modelo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4908,214 +4967,214 @@ Localização: A partir desta versão do Subsurface os modelos padrão são arquivos apenas de leitura e não devem ser editados diretamente, uma vez que a aplicação poderá recriar-los na inicialização.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Por favor salvar ou cancelar a edição do mergulho atual antes de usar o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Existem mudanças que não foram gravadas. Quer guardá-las no armazenamento na nuvem? Se responder não, o armazenamento na nuvem será sincronizado apenas da próxima vez que seleccionar "Abrir armazenamento na nuvem" ou "Salvar no armazenamento na nuvem".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Falha ao colocar o armazenamento remoto online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho antes de fechar o arquivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho atual antes de tentar adicionar um mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentando replanejar um mergulho que não foi criado no planejador.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Primeiro termine a edição atual antes de editar outro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Arquivos de registro de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Arquivos subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>Arquivos MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Todos arquivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Você quer salvar as alterações que fez no arquivo %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Você quer salvar as alterações feitas no arquivo?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[armazenamento na nuvem para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Abrir arquivo de uma versão antiga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Abriu um arquivo de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que diz a gestão de pontos de mergulho, que sofreu alterações importantes. O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos pontos de mergulho para garantir que tudo está correto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Contactando à nuvem...</translation> </message> @@ -5172,7 +5231,7 @@ Os módulos QML QtPositioning e QtLocation podem estar faltando!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>O filtro mostra %1 (of %2) mergulhos</translation> </message> @@ -5180,12 +5239,12 @@ Os módulos QML QtPositioning e QtLocation podem estar faltando!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Você deve atualizar o firmware do seu computador de mergulho: versão utilizada é %1 e a última versão estável é %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5194,27 +5253,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara para a transferência dos mergulhos antes de continuar com a atualização</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Agora não</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Atualizar firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Alerta de upgrade de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Salvar o firmware transferido como</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Arquivos de firmware</translation> </message> @@ -5352,8 +5411,8 @@ Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Sem arquivo padrão</translation> + <source>&No default file</source> + <translation>&Sem arquivo padrão</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5377,6 +5436,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5407,29 +5467,54 @@ Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Miniatura de vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>Executável ffmpeg</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Extrair na posição</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Extrair miniaturas de vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Apagar todas as preferências</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Restaurar configurações padrão</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Abrir arquivo de log padrão</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Arquivos subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Selecionar executável do ffmpeg</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5584,8 +5669,8 @@ Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Recalcular as miniaturas se forem mais antigas do que a imagem</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Recalcular as miniaturas se forem mais antigas do que o arquivo multimídia</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5624,7 +5709,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara <translation>Mostrar profundidade média no Perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -5703,27 +5788,27 @@ Se o seu computador de mergulho usa Bluetooth, prepare do mesmo modo que prepara <translation>Para carregar corretamente um novo idioma você deve reiniciar o Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Serão usados tal como estão. Isto pode não ser o que pretende. Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caracteres literais</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Caracter(es) não-especiais no formato de hora. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Caracter(es) não-especiais no formato de data. @@ -5775,7 +5860,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Armazenamento na nuvem do Subsurface</translation> </message> @@ -5800,73 +5885,58 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Salvar senha localmente?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Serviço web do Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID de usuário padrão</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Salvar ID do usuário localmente?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Sem proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Proxy do sistema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Alteração ignorada. Email e senha do armazenamento na nuvem pode conter somente letras, números, '.', '-', '_' e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Alteração ignorada. Email e senha do armazenamento na nuvem pode conter somente letras, números, '.', '-', '_' e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e senha do armazenamento na nuvem pode conter somente letras, números, '.', '-', '_' e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Armazenamento na nuvem do Subsurface (credenciais verificadas)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Armazenamento na nuvem do Subsurface (senha incorreta)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Armazenamento na nuvem do Subsurface (PIN requerido)</translation> </message> @@ -6194,133 +6264,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Computador de mergulho desconhecido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>A visualização do NDL /TTS foi desativada devido ao excessivo tempo de processamento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Marcar como computador principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Mergulho planejado</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Mergulho adicionado manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(cil. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Adicionar mudança no setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Dividir mergulho em dois</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Alterar modo do mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Editar o perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajustar pressão do cilindro %1 (atualmente interpolada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Esconder todos os %1 eventos?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Remover o evento selecionado?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Editar nome do favorito</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Apelido:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Nome é muito grande!</translation> </message> @@ -6328,53 +6398,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Abrir arquivo local com dados de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Falha ao abrir arquivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 mergulhos carregados do arquivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>Trabalhando em modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Erro ao ler armazenamento local. Cancelando</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Sem credenciais para a nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Favor inserir credenciais válidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e senha do armazenamento na nuvem pode conter somente letras, números, '.', '-', '_' e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Formato de email inválido</translation> </message> @@ -6424,50 +6494,50 @@ Please export this template to a different file.</source> <translation>Não foi possível conectar o armazenamento na nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciais da nuvem válidas, carregando mergulhos...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Erro no armazenamento na nuvem: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Carregando mergulhos do armazenamento local (modo local)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Falha na conexão à nuvem, alterando para modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Armazenamento na nuvem aberto com sucesso. Sem mergulhos na lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Localização GPS desconhecida</translation> </message> @@ -6475,7 +6545,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> @@ -6567,116 +6637,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Configurações</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Indefinido</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>usuário/senha incorretos</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Credenciais precisam ser verificadas</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Credenciais verificadas</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Modo local</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Estado do armazenamento na nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Não aplicável</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Alterar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Azul</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>texto normal</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Destacar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Escuro</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Serviço web de dados GPS do Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Distância limite (metros)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Tempo limite (minutos)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Cilindro padrão</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Cilindro:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Desenvolvedor</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Mostrar menu Desenvolvedor</translation> </message> @@ -6711,15 +6791,15 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Atenção! -Nem todas as imagens foram obtidas no entervalo entre 30 minutos antes e 30 minutos depois de nenhum dos mergulhos selecionados.</translation> +Nem todas os arquivos foram obtidas no entervalo entre 30 minutos antes e 30 minutos depois de qualquer dos mergulhos selecionados.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Carregar imagens mesmo que a sua hora não coincida com a hora do mergulho</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Carregar arquivos de multimídia mesmo que a sua hora não coincida com a hora do mergulho</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6742,39 +6822,39 @@ Nem todas as imagens foram obtidas no entervalo entre 30 minutos antes e 30 minu <translation>Qual dia e hora são mostrados na imagem?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Abrir imagem</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Arquivos de imagem</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Data/hora do mergulho selecionado</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Data/hora do primeiro mergulho selecionado</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Data/hora do último mergulho selecionado</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Arquivos com data/hora inapropriados</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Não foram encontrados dados Exif de data/hora</translation> </message> @@ -6867,28 +6947,28 @@ Arquivos com data/hora inapropriados</translation> <translation>Importar mensagens (erros, avisos, etc.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Abrir arquivos SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>Arquivos SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Todos arquivos</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Arquivos subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Abrir arquivos Subsurface</translation> </message> @@ -6896,64 +6976,64 @@ Arquivos com data/hora inapropriados</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pequeno</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Médio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data do mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duração: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Ponto de mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Dupla: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Guia: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7090,65 +7170,17 @@ Arquivos com data/hora inapropriados</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Entre o ID do usuário e clique Baixar</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Serviço web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Conectando...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Recebimento finalizado</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Erro no recebimento: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Erro de conexão:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Identificador de usuário inválido!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Não é possível analisar a resposta!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Transferência realizada com sucesso</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Roupa:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation>Roupas</translation> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Roupa não definida</translation> </message> @@ -7279,39 +7311,44 @@ Arquivos com data/hora inapropriados</translation> <translation>Nível de zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Carregar imagem(s) do(s) arquivo(s)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Carregar imagens da web</translation> + <source>Load media from file(s)</source> + <translation>Carregar multimídia(s) do(s) arquivo(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Apagar imagens selecionadas</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Carregar multimídia da web</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Remover todas as imagens</translation> + <source>Delete selected media files</source> + <translation>Apagar arquivos multimídia selecionados</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Apagar todos os arquivos multimídia</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Abrir diretório dos arquivos selecionados</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Recalcular as miniaturas selecionadas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Removendo imagens</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>Apagando arquivos multimídia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Você tem certeza que deseja apagar todas as imagens?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Você tem certeza que deseja apagar todas os arquivos multimídia?</translation> </message> </context> <context> @@ -7479,15 +7516,15 @@ misturados com ar usando: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Etiquetas:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Etiquetas</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Sem etiqueta</translation> </message> @@ -7686,7 +7723,7 @@ misturados com ar usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1clicar para visitar %2</translation> </message> @@ -7710,130 +7747,135 @@ misturados com ar usando: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 mostrados)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>CNS Máx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Multimídia antes/durante/depois do mergulho</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Parceiro</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotos antes/durante/depois do mergulho</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Local</translation> </message> @@ -7847,81 +7889,81 @@ misturados com ar usando: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Inserir URL das imagens</translation> + <source>Enter URL for media files</source> + <translation>Inserir URL dos arquivos multimídia</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Buscar atualizações.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface não conseguiu localizar atualizações</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>O seguinte erro ocorreu</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Por favor, verifique sua conexão a internet</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Usando a última versão do Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Uma nova versão do Subsurface está disponível.<br/>Clique em:<br/><a href="%1">%1</a><br/> para baixar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Uma nova versão do Subsurface está disponível.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Última versão é %1, por favor confira %2 nossa página de download %3 para informação de como atualizar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>A última versão é</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>O servidor retornou a seguinte informação:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface verifica a existência de novas versões a cada duas semanas. Caso não deseje que continue, por favor clique em Declinar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Declinar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Buscar atualizações automaticamente</translation> </message> @@ -8097,6 +8139,19 @@ Lingua: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>ffmpeg falhou ao iniciar - geração de miniaturas do vídeo foi suspensa</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>falha ao aguardar pelo ffmpeg - geração de miniaturas do vídeo foi suspensa</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8152,12 +8207,12 @@ Lingua: %1</translation> <translation>Enviar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Tempo limite para operação estourou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Transferindo dados...</translation> </message> @@ -8183,8 +8238,8 @@ Lingua: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Sem erros</translation> </message> @@ -8308,7 +8363,7 @@ Médio</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Erro ao analisar o cabeçalho</translation> </message> @@ -8645,9 +8700,9 @@ Médio</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxigênio</translation> </message> @@ -8662,131 +8717,131 @@ Médio</translation> <translation>Circuito aberto</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>pés/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>pés/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>cinto</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>tornozelo</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8863,123 +8918,123 @@ Médio</translation> <translation>Nenhum perfil de mergulho encontrado de '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Descarregar do armazenamento (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transferindo do armazenamento (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transferindo para armazenamento (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Cache local %s está corrompido - não é possível sincronizar com o armazenamento na nuvem do Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Não foi possível atualizar cópia local com novos dados remotos</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Armazenamento na nuvem está corrompido</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Não foi possível atualizar o armazenamento na nuvem do Subsurface. Tente novamente mais tarde</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Dados no servidor remoto divergem dos dados locais. Error: falha ao combinar (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Dados no servidor remoto divergem dos dados locais. Não foi possível combinar alterações. remotas e locais</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Dados no servidor remoto divergem dos dados locais</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Dados no servidor remoto divergem dos dados locais. Erro: falha ao salvar dados (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemas com o cache local dos dados da nuvem do Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Cache movido para %s. Tente a operação novamente.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Atualizar armazenamento local de acordo com o armazenamento na nuvem</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Enviar alterações locais para armazenamento na nuvem</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Tentar mesclar as alterações locais para o armazenamento na nuvem</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Salvar dados no armazenamento na nuvem</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sincronizar com armazenamento na nuvem</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Não foi possível conectar à nuvem, usando dados locais</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Conexão à nuvem bem sucedida, baixando dados</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Sincronização com armazenamento na nuvem concluída.</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Erro conectando com armazenamento na nuvem</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone de %s falhou (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Sincronizando arquivos de dados</translation> </message> @@ -9078,119 +9133,119 @@ Médio</translation> <translation>número de evento inválido</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/horário</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Erro na análise da duração do mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Erro ao ler temperatura</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Erro na análise da contagem de misturas de gases</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão na superfície</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Erro ao obter modo do mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Não é possivel criar o analisador para %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Erro no registo dos dados</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Mergulho já baixado em %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>modelo=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Não foi possível abrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Error ao abrir o dispositivo %s %s (%s). Na maioria dos casos, para debugar este problema, é útil enviar os arquivos de log. Você pode copiá-los para a área de transferência na opção "Sobre".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9199,13 +9254,13 @@ Na maioria dos casos, para debugar este problema, um arquivo de log da libdiveco Você pode criar este arquivo de log selecionando a opção correspondente no diálogo de download.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Não foram baixados novos mergulhos do computador de mergulho</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>várias posições GPS para este ponto de mergulho; também %s @@ -9213,19 +9268,19 @@ Você pode criar este arquivo de log selecionando a opção correspondente no di </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>nome adicional para ponto de mergulho: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Carregar dados do armazenamento local</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Dados dos mergulhos abertos com sucesso</translation> </message> @@ -9249,12 +9304,12 @@ Você pode criar este arquivo de log selecionando a opção correspondente no di </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> @@ -9285,8 +9340,8 @@ Você pode criar este arquivo de log selecionando a opção correspondente no di <translation>, GF=%d/%d efetivo</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Troca de SP</translation> </message> @@ -9548,17 +9603,17 @@ Você pode criar este arquivo de log selecionando a opção correspondente no di <translation>baixo pO₂ %.2f em %d:%02u com gás %s à profundidade %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Não é possivel achar gas o %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9567,84 +9622,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Parada de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9653,7 +9708,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9662,175 +9717,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densidade: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Parada de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Descompressão: duração desconhecida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Em deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Em deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Teto calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tecido %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD no tecido dominante </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>batimento cardíaco: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>direção: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>profundidade média até aqui %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9879,142 +9934,142 @@ EADD: %d%s / %.1fg/ℓ <translation>O</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AR</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mais de %1 dias</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(%n mergulho(s))</numerusform><numerusform>(%n mergulho(s))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXIGÊNIO</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Não é possivel abrir o arquivo %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Horário</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temperatura do ar</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temperatura da água</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Mergulhos</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Esconder todos</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Viagens</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Estatísticas</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Busca avançada</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibilidade</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Parceiro</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Roupa</translation> </message> @@ -10025,180 +10080,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mostrar mais detalhes</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Ano</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Tempo total</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Tempo médio</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Mais curto</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Mais longo</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Profundidade média</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Profundidade min.</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Profundidade máxima</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>SAC média</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>SAC min.</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>SAC max.</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temp. média</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temperatura mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temperatura máxima</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Voltar à lista</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Mergulho nº</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Perfil do mergulho</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informação do mergulho</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Equipamento de mergulho</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pressão de serviço</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Pressão inicial</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Pressão final</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Eventos</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valor</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordenadas</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Estado do mergulho</translation> </message> @@ -10228,62 +10283,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Todos (estatísticas por viagem)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10534,12 +10589,17 @@ O Uemis Zurich está corretamente conectado?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>seg</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>Não foi possível encontrar diretório 'theme' nos locais padrão</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Profundidade máx:</translation> @@ -10565,77 +10625,77 @@ O Uemis Zurich está corretamente conectado?</translation> <translation>Notas:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Construído</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Afundado</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Data afundamento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Razão</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nacionalidade</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Estaleiro</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Tipo de navio</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Comprimento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Boca</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Calado</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Deslocamento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Carga</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Dados do naufrágio</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Profundidade</translation> </message> @@ -10680,27 +10740,27 @@ O Uemis Zurich está corretamente conectado?</translation> <translation>Cidade</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Começar a salvar dados</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Começar a salvar mergulhos</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Armazenamento local criado com sucesso</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Preparando para salvar dados</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>alterar modo</translation> </message> @@ -10715,7 +10775,7 @@ O Uemis Zurich está corretamente conectado?</translation> <translation>Remover este ponto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Não salvar arquivos vazios na nuvem</translation> </message> @@ -10735,22 +10795,22 @@ O Uemis Zurich está corretamente conectado?</translation> <translation>Máximo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Resposta inválida do servidor</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Esperava rótulo XML 'DiveDateReader', recebido '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Rótulo XML 'DiveDates' esperado não foi encontrado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Resposta XML defeituosa. Linha %1: %2</translation> </message> @@ -10763,112 +10823,102 @@ O Uemis Zurich está corretamente conectado?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Gerenciamento de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Desativar sincronização automática</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Ativar sincronização automática</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Desabilitar serviço de localização</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Configurações</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Adicionar mergulho manualmente</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Transferir do Computador de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Sincronização manual</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Desligar a sincronização automática para o armazenamento na nuvem faz com que todos os dados sejam armazenados localmente. Isto pode ser útil em situações em que não haja internet ou com conexões limitadas. Por favor escolha 'Sincronização manual com o armazenamento remoto' se tem conexão à rede e deseja sincronizar os seus dados com a nuvem.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Enviar dados de GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Aplicar dados de GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Baixar dados de GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Mostrar dados de GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Limpar cache de GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Desenvolvedor</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Logs do aplicativo</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informações sobre o tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Sobre</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Iniciar serviço de localização</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 8974564d0..4351f0c97 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -167,160 +167,160 @@ <translation>A procurar dispositivos remotos...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>A busca terminou com sucesso.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>O dispositivo Bluetooth local foi %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>ligado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>desligado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>DESEMPARELHADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>EMPARELHADO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>EMPARELHADO_COM_AUTORIZAÇÃO</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Estado: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>O dispositivo %1 pode ser usado para a ligação. Pode premir o botão Gravar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>O dispositivo %1 tem que ser emparelhado antes de poder ser utilizado. Por favor utilize o menu de contexto para as opções de emparelhamento.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Um dispositivo precisa de um endereço não nulo para estabelecer a ligação</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>O dispositivo local foi alterado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Emparelhar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Remover emparelhamento</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>A tentar emparelhar o dispositivo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>A tentar desemparelhar o dispositvo %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>O dispositivo %1 foi desemparelhado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>O dispositivo %1 foi emparelhado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>O dispositivo %1 foi emparelhado e está autorizado.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>O dispositivo %1 já pode ser usado para a ligação. Pode premir o botão Gravar.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Erro no dispositivo local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Erro de emparelhamento. Se o dispositivo remoto necessita de um PIN próprio, por favor tente emparelhar os dispositivos usando as ferramentas do seu sistema operativo.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Erro desconhecido</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>O adaptador Bluetooth está desligado. Ligue-o antes de procurar outros dispositivos.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>A leitura ou escritia de/para o dispositivo deu um erro.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Ocorreu um erro desconhecido.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Erro na descoberta do dispositivo: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Não disponível</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Não é possível aceder ao adaptador Bluetooth local. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>O agente de descoberta de dispositivos não foi criado porque o endereço %1 não coincide com o endereço físico de nenhum dos dispositivos Bluetooth locais.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Companheiro:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Busca por companheiros e guias de mergulho</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Sem companheiros</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Cópia de segurança das configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Ficheiros de backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Erro na cópia de segurança XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ocorreu um erro ao efectuar a cópia de segurança. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Cópia de segurança efectuada com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>As suas configurações foram gravadas em: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Restaurar configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Erro ao restaurar XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocorreu um erro ao restaurar a cópia de segurança. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Reposição efectuada com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>As suas definições foram restauradas com sucesso.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Seleccionar ficheiro de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>A ligar ao dispositivo...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Ligado ao dispositivo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Desligado do dispositivo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar o ficheiro para descarregar o registo de mergulhos</translation> </message> @@ -1973,22 +1973,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Detalhes do mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Eliminar mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Cancelar edições</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Mostrar no mapa</translation> </message> @@ -1996,104 +1996,136 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Mergulho %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Local:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordenadas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Usar a localização do GPS actual:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Profundidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Duração:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temperatura do ar:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temperatura da água:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Garrafa:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation>Garrafa 1:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Mistura respiratória:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Pressão inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Pressão final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation>Garrafa 2:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation>Garrafa 3:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation>Garrafa 4:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation>Garrafa 5:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Classificação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notas:</translation> </message> @@ -2262,104 +2294,119 @@ do GPS actual:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Colapsar todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Colapsar outros</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Criar uma nova viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Juntar esta viagem com a viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Juntar esta viagem com a viagem abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Eliminar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Juntar os mergulhos seleccionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Deslocar os tempos de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Dividir os mergulhos seleccionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Carregar imagens do(s) ficheiro(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Carregar imagem da internet</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Imagens (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation>Abrir ficheiros multimedia:</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 não parece ser uma imagem</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation>Ficheiros multimedia</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Ficheiros de imagem</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Abrir ficheiros de imagens</translation> + <source>Video files</source> + <translation>Ficheiros vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Todos os ficheiros</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 não parece ser uma imagem</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ do GPS actual:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Leve</translation> </message> @@ -2570,121 +2617,121 @@ do GPS actual:</translation> <translation>Areia</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Formato de uso genérico para trocar dados entre vários programas relacionados com o mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valores separados por vírgulas que descrevem o perfil do mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valores separados por vírgulas que descrevem dados sobre o mergulho. Incluem a maior parte dos dados de mergulho mas não informações sobre o perfil,</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Enviar dados de mergulho para o sítio da web do divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Enviar dados de mergulho para o sítio dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Exportar HTML dos locais de mergulho, visualizados num mapa mundo.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Formato XML nativo do Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Gravar as profundidades das imagens para um ficheiro</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Exportar o mergulho como macros TeX para o ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exportar ficheiro UDDF como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>Ficheiros UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>Ficheiros CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>Ficheiros HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>Ficheiros TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exportar ficheiro CSV como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exportar mapa mundo</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportar XML do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Gravar profundidades das imagens</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exportar para um ficheiro TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exportar ficheiros HTML como</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>A exportar. Por favor aguarde...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Não é possível abrir o ficheiro %s</translation> </message> @@ -3044,62 +3091,62 @@ do GPS actual:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>garr.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>Setpoint Circuito fechado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Modo de mergulho</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Tempos das paragens</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>CNS Máx</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Categorias</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotos</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation>Media</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Companheiros</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotos antes/durante/depois do mergulho</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation>Imagens antes/durante/depois do mergulho</translation> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>não foram seleccionados nenhuns mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>não foi possível encontrar a folha de estilos para exportar para divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>erro ao criar um ficheiro zip para upload> %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>erro interno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>A conversão do mergulho %1 para o formato divelogs.de falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>erro na escrita do ficheiro zip: %s erro zip %d erro de sistema %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Concluído</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>A carregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>A transferir a lista dos mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>A transferir %1 mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Transferência terminada - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problema ao descarregar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Não foi possível abrir o ficheiro: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Transferência corrompida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Não foi possível abrir o ficheiro: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Carregamento terminado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>A exportação falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Exportação bem sucedida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>O login falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Não foi possível analisar a resposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Transferir</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Seleccione o modo de descarga Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>A ligar ao computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Erro</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Procurar computador de mergulho Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation>Procurar computador de mergulho Garmin</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Cancelar a descarga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar o ficheiro para descarregar o registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Escolher o ficheiro para a descarga do ficheiro binário do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Ficheiros dump (Registos da memória do computador de mergulho)</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Tentar a descarga novamente</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gravar a descarga do libdivecomputer não transfere os mergulhos para a lista</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Transferir</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth está desactivado</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Nome do fabricante:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation>Dispositivo USB</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Computador de mergulho:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Ligação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Voltar a procurar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Mergulhos descarregados</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Informação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Seleccionar todos</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Desmarcar todos</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Ligar ao campo de texto do Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Para desligar o Subsurface da sua conta do Facebook, use o menu 'Ligar partilha'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Para ligar ao Facebook, por favor inicie a sessão (login). Isto permite ao Subsurface publicar os mergulhos na sua Cronologia (timeline)</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Registo no Facebook com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Erro, ID de utilizador desconhecida, não é possível entrar</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Mergulho carregado para o Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>O carregamento do mergulho falhou. Por favor reveja a mensagem e envie-a para a mailing list do Subsurface</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Seleccionar todos</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Desmarcar todos</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inverter selecção</translation> </message> @@ -3932,18 +3996,18 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> - <translation>Encontrar imagens que tenham sido movidas</translation> + <source>Find moved media files</source> + <translation>Procurar ficheiros multimedia</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> - <translation>Imagens encontradas</translation> + <source>Found media files</source> + <translation>Ficheiros encontrados</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> - <translation>Fazer a correspondência das imagens apenas para o(s) mergulho(s) seleccionado(s)</translation> + <source>Match only media files in selected dive(s)</source> + <translation>Fazer a correspondência de ficheiros multimedia apenas para o(s) mergulho(s) seleccionado(s)</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> @@ -3958,8 +4022,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Atravessar as pastas das imagens</translation> + <source>Traverse media directories</source> + <translation>Atravessar as pastas de ficheiros multimedia</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3973,18 +4037,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> - <translation>Não foram encontradas imagens</translation> + <source>No matching media files found</source> + <translation>Não foram encontrados ficheiros multimedia</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> - <translation>Encontradas <b>%1</b>imagens na sua localização actual.</translation> + <source>Found <b>%1</b> media files at their current place.</source> + <translation>Encontrados<b>%1</b>ficheiros multimedia na localização actual.</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> - <translation>Encontradas <b>%1</b>imagens em localizações novas:</translation> + <source>Found <b>%1</b> media files at new locations:</source> + <translation>Encontrados <b>%1</b>ficheiros em novas localizações:</translation> </message> </context> <context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Local:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Local</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(posição GPS igual)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 ausente</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n mergulho aqui)</numerusform><numerusform>, %n mergulho(s) aqui)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(sem posição GPS. Adicionar posição GPS a partir deste mergulho)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(sem dados GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Escolher local:</translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Não foi definido um local</translation> </message> @@ -4242,8 +4306,8 @@ Tem a certeza que quer continuar?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -4264,19 +4328,19 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temp. do ar</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temp. da água</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Local</translation> </message> @@ -4357,8 +4421,8 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotos</translation> + <source>Media</source> + <translation>Media</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ Tem a certeza que quer continuar?</translation> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temp. do ar [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temp. da água [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Estão a ser editados vários mergulhos.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Este mergulho está a ser editado.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Notas sobre a viagem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Local da viagem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Novo local de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Eliminar as alterações?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Está prestes a eliminar as alterações.</translation> </message> @@ -4470,424 +4534,419 @@ Tem a certeza que quer continuar?</translation> <translation>&Importar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Ligar partilha</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Novo logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Abrir logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>G&ravar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Guardar como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Fechar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Encerrar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Imprimir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&referências</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Fechar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importar do &computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importar dados de &GPS a partir do serviço Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Editar &nomes dos dispositivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Adicionar mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Editar mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copiar detalhes do mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Colar detalhes do mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Agrupar &automaticamente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Estatísticas anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Lista de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Perfil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Informações</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Todos os painéis</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Computador de mergulho &anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Próximo computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Acerca do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Manual do utilizador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Mapa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanear mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importar ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importar logbooks de outros programas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importar &de Divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Ecrã completo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Ligar/desligar ecrã completo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Procurar actualizações</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exportar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exportar logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configurar &computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>E&ditar mergulho no planeador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Mostrar/ocultar gráfico da pO₂ </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Mostrar/ocultar gráfico da pN₂ </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Mostrar/ocultar gráfico de pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Mostrar/ocultar o tecto calculado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Mostrar/ocultar cálculo para todos os tecidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Mostrar/ocultar ritmo cardíaco</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Mostrar/ocultar MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Mostrar/ocultar EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Mostrar/ocultar NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Mostrar/ocultar taxa de consumo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Mostrar/ocultar régua</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Escalar gráfico</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Mostrar/ocultar imagens</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation>Mostrar/ocultar ficheiros multimedia</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation>&Procurar ficheiros movidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Mostrar/ocultar barra de gases</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrar lista mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Mostrar/ocultar mapa de tecidos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>&Questionário ao utilizador</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Reverter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Refazer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Encontrar imagens que foram movidas</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Abrir armazenamento &remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Gravar rem&otamente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Gerir locais de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>&Editar locais de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Armazenamento remoto em linha</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Ligar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Desligar de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>A tentar juntar mergulhos com %1min de intervalo entre eles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Criada cópia de segurança do modelo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4908,214 +4967,214 @@ Localização: Por favor tenha em atenção que a partir desta versão do Subsurface os modelos padrão são ficheiros apenas de leitura e não devem ser editados directamente, uma vez que a aplicação poderá criá-los novamente no arranque.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Por favor grave ou cancele as edições ao mergulho antes de usar o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Existem mudanças que não foram gravadas. Quer guardá-las no armazenamento remoto? Se responder não, o armazenamento remoto será sincronizado apenas da próxima vez que seleccionar "Abrir armazenamento remoto" ou "Guardar no armazenamento remoto".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Falha ao colocar o armazenamento remoto em linha</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termine a edição em curso antes de iniciar outra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[armazenamento remoto para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>A abrir ficheiro de uma versão mais antiga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Abriu um ficheiro de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que respeita a gestão de locais de mergulho, que sofreu alterações importantes. O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos locais de mergulho para garantir que tudo está correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>A contactar o serviço remoto...</translation> </message> @@ -5172,7 +5231,7 @@ Os módulos QML QtPositioning e QtLocation podem estar em falta!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>O filtro mostra %1 (de %2) mergulhos</translation> </message> @@ -5180,12 +5239,12 @@ Os módulos QML QtPositioning e QtLocation podem estar em falta!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Deve actualizar o firmware no seu computador de mergulho: tem a versão %1 mas a última versão estável é a %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5194,27 +5253,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo que prepara a descarga dos mergulhos para o logbook</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Agora não</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Actualizar firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Alerta de upgrade de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Gravar o firmware transferido como</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Ficheiros de firmware</translation> </message> @@ -5352,8 +5411,8 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Não existe ficheiro padrão</translation> + <source>&No default file</source> + <translation>&Sem ficheiro por defeito</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5377,6 +5436,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5407,29 +5467,54 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation>Miniaturas vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation>executável ffmpeg</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation>Extrair na posição</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation>Extrair miniaturas vídeo</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Limpar todas as definições</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Restaurar todas as definições para o seu valor padrão</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Abrir ficheiro de registo de mergulhos padrão</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation>Seleccionar executável ffmpeg</translation> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5584,8 +5669,8 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Recalcular as miniaturas se forem mais antigas do que a imagem</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation>Recalcular miniaturas se forem mais antigas do que o ficheiro multimedia</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5624,7 +5709,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <translation>Mostrar profundidade média no Perfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Perfil</translation> </message> @@ -5703,27 +5788,27 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Serão usados tal como estão. Isto pode não ser o que pretende. Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caracteres literais</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Caracter(es) não-especiais no formato de hora. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Caracter(es) não-especiais no formato de data.</translation> @@ -5774,7 +5859,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Armazenamento remoto do Subsurface</translation> </message> @@ -5799,73 +5884,58 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Gravar a palavra-passe localmente?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Serviço web do Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID do utilizador</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Gravar o ID do utilizador localmente?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Sem proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Proxy do sistema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Alteração ignorada. Os campos "email" e "password" da conta de armazenamento remoto só podem ser compostos por letras, números e '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Alteração ignorada. Os campos "email" e "password" da conta de armazenamento remoto só podem ser compostos por letras, números e '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Armazenamento remoto do Subsurface (credenciais verificadas)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Armazenamento remoto do Subsurface (palavra-passe incorrecta)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Armazenamento remoto do Subsurface (necessário o PIN)</translation> </message> @@ -6194,133 +6264,133 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation>(#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Computador de mergulho desconhecido</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Marca do computador de mergulho principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Mergulho planeado</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Mergulho adicionado manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(garr. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Adicionar mudança no setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation>Dividir mergulho em dois</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Mudar modo de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Editar o perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajustar a pressão da garrafa %1 (presentemente interpolada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Ocultar todos os %1 eventos?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Remover o evento seleccionado?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Editar nome do marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Nome personalizado:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>O nome é demasiado comprido!</translation> </message> @@ -6328,53 +6398,53 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>A inicial...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Abrir ficheiro local com dados de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Não foi possível abrir o ficheiro local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 mergulhos carregados a partir do ficheiro local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>A trabalhar em modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Erro na análise do armazenamento local, a cancelar</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>Não existem credenciais da nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Por favor insira credenciais de nuvem válidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Formato de endereço de correio electrónico inválido</translation> </message> @@ -6424,50 +6494,50 @@ Por favor exporte o modelo para outro ficheiro.</translation> <translation>Não é possível ligar-se com o armazenamento remoto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciais remotas válidas, a carregar os mergulhos...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Erro no armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>A carregar mergulhos do armazenamento local (modo 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Falha na ligação ao servidor remoto. A passar para modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Armazenamento remoto aberto com sucesso. Não existem mergulhos na lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Localização GPS desconhecida</translation> </message> @@ -6475,7 +6545,7 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>A iniciar...</translation> </message> @@ -6567,116 +6637,126 @@ Por favor exporte o modelo para outro ficheiro.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Definições</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Indefinido</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Combinação nome de utilizador/palavra-chave incorrecta</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>As credenciais precisam de ser verificadas</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Credenciais verificadas</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Modo local </translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Estado do armazenamento remoto</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Não aplicável</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Alterar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Azul</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>texto</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Salientar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Escuro</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Serviço web de dados GPS do Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Distância mínima (m)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Duração mínima (minuto)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Garrafa preferida</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Garrafa:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Desenvolvedores</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Mostrar o menu do programador</translation> </message> @@ -6711,16 +6791,16 @@ Por favor exporte o modelo para outro ficheiro.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation>Atenção! -Nem todas as imagens foram obtidas no entervalo entre -30 minutos antes e 30 minutos depois de nenhum dos mergulhos seleccionados.</translation> +Nem todos os ficheiros têm foram criados no intervalo compreendido +entre 30 minutos antes do início e 30 minutos depois do final de qualquer mergulho seleccionado.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Carregar imagens mesmo que a sua hora não coincida com a hora do mergulho</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation>Carregar ficheiros multimedia mesmo que a hora de criação não corresponda ao tempo do mergulho</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6743,38 +6823,38 @@ Nem todas as imagens foram obtidas no entervalo entre <translation>Que data e hora estão representados na imagem?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Abrir imagem</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Ficheiros de imagem</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Data/hora de mergulho seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Primeira data/hora de mergulho seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Ùltima data/hora de mergulho seleccionada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation>Ficheiros com data/hora inapropriada</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Não foram encontrados dados Exif de data/hora</translation> </message> @@ -6867,28 +6947,28 @@ Files with inappropriate date/time</source> <translation>Importar mensagens (erros, avisos, etc.)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Abril ficheiros Smarttrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>Ficheiros SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Abrir ficheiros Subsurface</translation> </message> @@ -6896,64 +6976,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pequeno</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Médio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data do mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duração: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Local do mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Companheiro: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Guia de mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7090,65 +7170,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Introduza o ID do utilizador e clique em "Transferir"</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Serviço web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>A ligar ...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Transferência terminada</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Erro na transferência: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Erro de ligação:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Identificação de utilizador inválida !</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Não foi possível analisar a resposta !</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Transferência bem sucedida</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Fatos:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Fato não definido</translation> </message> @@ -7279,39 +7311,44 @@ Files with inappropriate date/time</source> <translation>Nível de zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Carregar imagens do(s) ficheiro(s)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Carregar imagens da web</translation> + <source>Load media from file(s)</source> + <translation>Carregar ficheiros multimedia a partir do(s) ficheiro(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Apagar imagens seleccionadas</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation>Carregar ficheiro(s) multimedia a partir da internet</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Apagar todas as imagens</translation> + <source>Delete selected media files</source> + <translation>Apagar os ficheiros multimedia seleccionados</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation>Apagar todos os ficheiros multimedia</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation>Abrir pasta dos ficheiros multimedia seleccionados</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Recalcular as miniaturas seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>A eliminar imagens</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation>A apagar os ficheiros multimedia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Tem a certeza que quer apagar todas as imagens?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation>Tem a certeza que quer eliminar todos os ficheiros seleccionados?</translation> </message> </context> <context> @@ -7479,15 +7516,15 @@ obtidos a partir do ar usando: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Categorias:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Categorias</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Categorias vazias</translation> </message> @@ -7686,7 +7723,7 @@ obtidos a partir do ar usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1clicar para visitar %2</translation> </message> @@ -7710,130 +7747,135 @@ obtidos a partir do ar usando: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 mostrados)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>CNS Máx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Categorias</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation>Imagens antes/durante/depois do mergulho</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Companheiros</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotos antes/durante/depois do mergulho</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Local</translation> </message> @@ -7847,81 +7889,81 @@ obtidos a partir do ar usando: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Inserir URL das imagens</translation> + <source>Enter URL for media files</source> + <translation>Introduzir o URL dos ficheiros multimedia</translation> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Procurar actualizações</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Não foi possível encontrar actualizações para o Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Ocorreu o seguinte erro :</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Por favor, verifique a ligação à Internet</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Está a usar a última versão do Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Está disponível uma nova versão do Subsurface.<br/>Clique em:<br/><a href="%1">%1</a><br/> para a transferir.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Está disponível uma nova versão do Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>A última versão é %1. Por favor verifique %2 a nossa página de downloads %3 para obter informações sobre como actualizar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>A última versão lançada foi </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>O servidor retornou a informação seguinte:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>O Subsurface verifica a existência de novas versões a cada duas semanas. Se não desejar que tal aconteça, por favor clique em Declinar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Declinar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Verificar automaticamente a existência de actualizações</translation> </message> @@ -8097,6 +8139,19 @@ Linguagem: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation>falha ao executar o ffmpeg - criação das miniaturas vídeo suspensa</translation> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation>falha durante a espera pela execução do ffmpeg - criação das miniaturas vídeo suspensa</translation> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8152,12 +8207,12 @@ Linguagem: %1</translation> <translation>Carregar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>A operação demorou demasiado tempo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>A transferir dados...</translation> </message> @@ -8183,8 +8238,8 @@ Linguagem: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Sem erros</translation> </message> @@ -8308,7 +8363,7 @@ Média</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Erro ao analisar o cabeçalho</translation> </message> @@ -8645,9 +8700,9 @@ Média</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxigénio</translation> </message> @@ -8662,131 +8717,131 @@ Média</translation> <translation>Circuito aberto</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>cinto</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>tornozelo</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8863,123 +8918,123 @@ Média</translation> <translation>Não foi encontrado um perfil de mergulho em '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Descarregar do armazenamento (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transferir do armazenamento (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transferir para o armazenamento (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>A cache da pasta %s está corrompida - não é possível sincronizar com o armazenamento remoto do Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Não foi possível actualizar a cache local com os novos dados no servidor remoto</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>O armazenamento remoto do Subsurface está corrompido</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Não foi possível actualizar o armazenamento remoto do Subsurface. Tente novamente mais tarde</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>O dados remotos divergem dos dados locais. Erro: falha na junção (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Os dados no servidor remoto divergem dos dados locais. Não é possível combinar as diferenças.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Os dados no servidor remoto divergem dos dados locais.</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Os dados no servidor remoto divergem dos dados locais. Erro: a escrita dos dados falhou (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemas com a cache local dos dados remotos do Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Cache movida para %s. Tente novamente a operação.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>A actualizar o armazenamento local de acordo com o armazenamento remoto</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Transferir alterações locais para o armazenamento remoto</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Tentar fundir as alterações locais para o armazenamento remoto</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Armazenar dados remotamente</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sincronizar com o armazenamento remoto</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Não foi possível ligar ao servidor remoto, usando os dados armazenados localmente</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Ligação remota bem sucedida, a descarregar dados</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Sincronização com o armazenamento remoto concluída</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Erro ao ligar ao armazenamento remodo do Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Falha (%s) no git clone %s </translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>A sincronizar o ficheiro de dados</translation> </message> @@ -9078,119 +9133,119 @@ Média</translation> <translation>Número de evento inválido</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/tempo</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Erro na análise do tempo de mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Erro ao analisar tempetaturas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Erro na análise na contagem da mistura de gás</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão atmosférica</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Erro ao obter o modo de mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Não é possivel criar o "parser" para %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Erro no registo de dados</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Mergulho já descarregado em %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>modelo=%s firmware=%u numserie=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Erro ao abrir o dispositivo %s %s (%s). Na maioria dos casos, de modo a despistar o problema, é útil enviar os registos à equipa de desenvolvimento. Pode copiá-los para a área de transferência no diálogo "Sobre o Subsurface".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9199,13 +9254,13 @@ Na maioria dos cados, será útil obter um ficheiro log do libdivecomputer para Poderá criar este ficheiro seleccionando a opção respectiva no menu de download.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Não foram descarregados novos mergulhos do computador de mergulho</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>várias posições GPS para este local; ver também %s @@ -9213,19 +9268,19 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>nome adicional para o local: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Carregar dados do armazenamento local</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Dados de mergulho abertos com sucesso</translation> </message> @@ -9248,12 +9303,12 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> @@ -9284,8 +9339,8 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>, GF=%d/%d efectivo</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Mudança de SP</translation> </message> @@ -9547,17 +9602,17 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>valor de pO₂ baixo %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Não foi possível encontrar o gás %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9566,84 +9621,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Paragem de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9652,7 +9707,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9661,175 +9716,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densidade: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Paragem de segurança: duração desconhecida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Descompressão: duração desconhecida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>Em descompressão </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Descompressão: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>Em descompressão (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Tecto calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Compartimento %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>Contradifusão hiperbárica no tecido director </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>frequência cardíaca: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>Rumo: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>profundidade média até aqui %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9878,142 +9933,142 @@ EADD: %d%s / %.1fg/ℓ <translation>O</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Ar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EANx</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mais de %1 dias</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation><numerusform>(% mergulho)</numerusform><numerusform>(%n mergulhos)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXIGÉNIO</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Não é possível abrir o ficheiro %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Tempo</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temp. do ar</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temp. da água</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Mergulhos</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Colapsar todos</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Viagens</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Estatísticas</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Pesquisa avançada</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Visibilidade</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Guia de mergulho</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Companheiros</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Fato</translation> </message> @@ -10024,180 +10079,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Categorias</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notas</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Mostrar mais detalhes</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Ano</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Tempo total</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Duração média</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Duração mais curta</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Duração mais longa</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Profundidade média</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Prof. mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Prof. Max.</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Consumo médio à superfície</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Consumo mínimo</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Consumo máximo</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temperatura média</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temperatura mínima</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temperatura máxima</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Regressar à lista</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Mergulho #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Perfil de mergulho</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informações sobre o mergulhoq</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Equipamento de mergulho</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Capacidade</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pressão de serviço</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Pressão inicial</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Pressão final</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Eventos</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valor</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordenadas</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Estado do mergulho</translation> </message> @@ -10227,62 +10282,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Todos (estatísticas por viagem)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10533,12 +10588,17 @@ O Uemis Zurich está correctamente ligado?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>seg</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation>Não foi possível encontrar uma pasta chamada 'tema' nas localizações padrão</translation> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Profundidade máxima:</translation> @@ -10564,77 +10624,77 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Notas:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Construído</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Afundado</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Hora de imersão</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Razão</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nacionalidade</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Estaleiro</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Tipo de navio</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Comprimento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Boca</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Calado</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Deslocamento</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Carga</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Dados do naufrágio</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Profundidade</translation> </message> @@ -10679,27 +10739,27 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Cidade</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Iniciar registo dos dados</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Iniciar registo dos mergulhos</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Armazenamento local criado com sucesso</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>A prerarar para gravar dados</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>alterar modo</translation> </message> @@ -10714,7 +10774,7 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Remover este ponto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Não gravar um ficheiro vazio remotamente</translation> </message> @@ -10734,22 +10794,22 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Máxima</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Resposta inválida do servidor</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Esperada a tag XML 'DiveDateReader'. Em vez disso foi recebida a '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>A tag XML esperada 'DiveDates' não foi encontrada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Resposta XML mal formada. Linha %1: %2</translation> </message> @@ -10762,112 +10822,102 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Gestão de mergulhos</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Desactivar a sincronização automática com a nuvel</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Ligar sincronização automática com a nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Desactivar serviços de geolocalização</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Definições</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Adicionar um mergulho manualmente</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Descarregar do computador de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Sincronizar manualmente com a nuvem </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Desligar a sincronização automática para o armazenamento remoto faz com que todos os dados sejam armazenados localmente. Isto pode ser útil em situações em que não haja internet ou com ligações limitadas. Por favor escolha 'Sincronização manual com o armazenamento remoto' se tem ligação à rede e deseja sincronizar os seus dados com a nuvem.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Carregar dados GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Aplicar as posições de GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Descarregar dados GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Mostrar pontos GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Limpar a memória GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Desenvolvedores</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Registo da app</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informações sobre o tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Sobre</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Activar serviço de localização</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index 67468ec99..bd36e43c1 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -165,160 +165,160 @@ <translation>Scanare după alte dispozitive...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Scanarea s-a terminat cu succes</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Dispozitivul local Bluetooth a fost %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>pornit</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>oprit</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>NEÎMPERECHEAT</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>ÎMPERECHEAT</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>ÎMPERECHEAT_CU_AUTORIZARE</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Stare: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Dispozitivul %1 poate fi folosit pentru conexiune. Pentru a continua apăsați butonul de salvare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Dispozitivul %1 trebuie împerechat înainte de folosire. Pentru a împerechea dispozitivele folosiți meniul contextual.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Un dispozitiv are nevoie de o adresa diferita de zero pentru conexiune.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Dispozitivul local a fost schimbat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Împerechere</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Desperechere</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Se încearcă împerecherea cu %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Se încearca desperecherea cu %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Dispozitivul %1 a fost desperecheat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Dispozitivul %1 a fost împerecheat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Dispozitivul %1 a fost împerecheat cu autorizare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Dispozitivul %1 poate fi folosit pentru conexiune. Pentru a continua apăsați butonul de salvare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>A apărut o eroare legată de dispozitivul local: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Eroare la împerechere. Dacă dispozitivul cu care se dorește împerecherea are nevoie de un cod PIN customizat, vă rugăm să împerecheați dispozitivele folosind utilitarul sistemului de utilizare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Eroare necunoscută.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Adaptorul Bluetooth nu este pornit. Pentru a descoperi alte dispozitive, acesta trebuie pornit.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Încercarea de scriere/citire s-a finalizat cu o eroare.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>A apărut o eroare necunoscută.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>A apărut o eroare la descoperirea dispozitive: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Indisponibil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Adaptorul Bluetooth local nu poate fi accesat.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Agentul folosit pentru descoperirea dispozitivelor Bluetooth nu a fost creat deoarece nu există niciun dispozitiv Bluetooth local ce are adresa %1.</translation> </message> @@ -326,12 +326,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Persoană: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Căutare de însoțitori și experți în scufundări</translation> </message> @@ -339,7 +339,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Niciun însoțitor</translation> </message> @@ -1660,102 +1660,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Eroare</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Crează copie de rezervă pentru setărilor dispozitivului de scufundări</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Fisiere backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Eroare restaurare copie de rezervă XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>A apărut o eroare în timp ce se salva fișierul de rezervă. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Restaurarea copiei de rezervă s-a terminat cu succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Setările au fost salvate în fișierul: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Restaurează setările dispozitivului de scufundare</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Eroare restaurare XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>A apărut o eroare în timp ce se restaura fișierul de rezervă. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Restaurare finalizată cu succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Setările au fost restaurate cu succes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Selectează fișierul de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Toate fisierele</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Fisiere jurnal</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Conectare la dispozitiv...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Conetat la dispozitiv</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Deconectat de la dispozitiv</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Alege-ți fisier pentru logul computerului</translation> </message> @@ -1971,22 +1971,22 @@ computerul de scufundări selectat?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Detalii scufundare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Stergere scufundare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Anulare editare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Afisare pe harta</translation> </message> @@ -1994,104 +1994,136 @@ computerul de scufundări selectat?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Scufundare %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Dată:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Locație:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Coordonate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Foloseste posizitia GPS curenta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Adancime:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Durată:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Temperatura aer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Temperatura apa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Costum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Însoțitor:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Maestru scufundare:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Lest:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Butelie:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Mix de gaze:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Presiune initiala:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Presiune finala:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Vizibilitate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notițe:</translation> </message> @@ -2260,104 +2292,119 @@ GPS curenta:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandare totală</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Colapsare separată</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Colapsare separată</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Elimină scufundare/scufundări din excursie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Adaugă o nouă excursie deasupra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Adaugă scufundare/scufundări excursiei aflate deasupra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Adaugă scufundare/scufundări excursiei aflate sub</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Unește excursia cu cea aflată deasupra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Unește excursia cu cea aflată sub</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Șterge scufundare/scufundări</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Marchează scufundarea/scufundările ca fiind invalidă/invalide</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Unește scufundările selectate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Renumerotează scufundarea/scufundările</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Schimbarea timpilor de scufundare</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Împărțirea scufundărilor selectate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Încărcarea imaginilor din fișier</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Incarcati imagine din web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Fișier imagine (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 nu este o imagine</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Fisiere imagine</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Deschide fișierele imaginilor</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Toate fisierele</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 nu este o imagine</translation> </message> </context> <context> @@ -2558,7 +2605,7 @@ GPS curenta:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Luminozitate</translation> </message> @@ -2568,121 +2615,121 @@ GPS curenta:</translation> <translation>Nisip</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Format generic ce este folosit pentru schimbul de date între diverse programe de scufundări</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Valori separate prin virgulă ce descriu profilul scufundării</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Valori separate prin virgulă ce reprezintă informațiile scufundării. Acestea includ majoritatea detaliilor, fără informații legate de profil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Trimite datele scufundării pe site-ul divelogs.de .</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Trimiteți datele de scufundare la siteul dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>Export HTML al locațiilor scufundărilor vizualizate pe harta lumii.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Format XML nativ Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Scrie adâncimea imaginilor in fișier.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Salveaza scufundarea in fisier ca macro in format TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exportă ca fișier UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>Fisiere UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>Fisiere CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>Fisiere HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Fisiere Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>Fisiere TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exporă ca fișier CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exportă harta lumii</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportă XML Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Salvează adâncimile imaginii</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exporta in fisier TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exportă ca fișier HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Vă rugăm aștepați, se exportă...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Nu se poate deschide fișierul %s</translation> </message> @@ -3042,62 +3089,62 @@ GPS curenta:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>but.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Adâncime finală</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Timp de rulare</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gaz folosit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>Valorare CC de refetință</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Mod de scufundare</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Timpi oprire</translation> </message> @@ -3302,261 +3349,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Butelie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>CNS maxim</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Etichete</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotografii</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Tara</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Însoțitor</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Adâncime(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Greutate(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Fotografii înainte/în timpul/după scufundare</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>nu a fost selectată nicio scufundare</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Fișierul style pentru export la divelogs.de nu a fost găsit</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>nu a reușit să se creeze fișierul zip pentru upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>eroare internă</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Conversia scufundării %1 in formatul divelogs.de a eșuat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>eroare la scrierea fișierului zip: %s eroare zip %d eroare sistem %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Finalizat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Se uploadează lista de scufundări...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Se descarcă lista de scufundări...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Se descarcă scufundările %1...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Descărcarea s-a terminat - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problema legată de descărcare</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Arhiva nu a putut fi deschisă: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Descărcarea a fost coruptă.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Arhiva nu a putut fi deschisă: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Upload-ul a fost finalizat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Upload-ul a eșuat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Upload-ul a avut succes</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Logarea a eșuat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Nu s-a putut parsa răspunsul</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Eroare: %1</translation> </message> @@ -3564,23 +3617,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Descarcă</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Descărcarea datelor folosind Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Se conecteaza la computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Eroare</translation> </message> @@ -3590,42 +3643,47 @@ p, li { white-space: pre-wrap; } <translation>Găsește calculatorul de scufundări Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Anulare descărcare</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Alege-ți fișier pentru descărcarea logului computerului</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Fisiere jurnal</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Alege-ți fișier pentru fișierul sursa binar al computerului</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Fisiere date extrase</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Reîncearcă descărcarea</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Salvând dump-ul libdivecomputer nu se vor mai descărca scufundările din listă.</translation> </message> @@ -3697,9 +3755,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Descarcă</translation> </message> @@ -3725,7 +3783,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Anulează</translation> </message> @@ -3740,57 +3798,63 @@ p, li { white-space: pre-wrap; } <translation>Nu este activat Bluetooth</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Nume producător:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Computer scufundare:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Conexiune:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Reîncearcă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Ieșire</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Rescanare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Scufundari descarcate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Informație:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Acceptă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Selectează totul</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Deselecteaza tot</translation> </message> @@ -3821,12 +3885,12 @@ p, li { white-space: pre-wrap; } <translation>Conectați-vă la locul text din Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Pentru a deconecta Subsurface de la contul Facebook, folosiți 'Partajați ca' din meniu.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Pentru a vă conecta la Facebook, va rugăm să vă autentificați. Acesta va permite aplicației Subsurface să publice scufundările pe timeline-ul dumneavoastă</translation> </message> @@ -3834,22 +3898,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Autentificare Facebook reusita</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Eroare, identificator utilizator necunoscut, nu se poate autentifica.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Scufundare postata pe facebook cu success</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Postare scufundare nereusita. Verificati jurnalele de erori si trimiteti spre forumul-mail Subsurface</translation> </message> @@ -3865,17 +3929,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Selectează totul</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Deselecteaza tot</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Inversare selectie</translation> </message> @@ -3930,17 +3994,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3956,8 +4020,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Imagine direcții traverse</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3971,17 +4035,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4074,40 +4138,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Locație: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Locație</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (același punct GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (departe ~%1)</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n scufundare(i) aici)</numerusform><numerusform>, %n scufundare(i) aici)</numerusform><numerusform>, %n scufundare(i) aici)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(nu există date GPS, adaugă o locație GPS pentru această scufundare)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>((nu există date GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Alege locația: </translation> </message> @@ -4115,7 +4179,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Nu a fost setată nicio locație</translation> </message> @@ -4240,8 +4304,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notițe</translation> </message> @@ -4262,19 +4326,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Temperatura aerului</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Temperatura apei</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Locație</translation> </message> @@ -4355,8 +4419,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotografii</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4389,53 +4453,53 @@ p, li { white-space: pre-wrap; } <translation>Adaugă sistem de greutate</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Temperatura aerului [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Temperatura apei [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Această excursie este editată.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Scufundări multiple sunt editate.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Această scufundare este editată.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Notițe excursie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Locație excursie</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Locație de scufundare nouă</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Renunțați la modificări?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Sunteți pe cale să renunțați la modificări.</translation> </message> @@ -4468,424 +4532,419 @@ p, li { white-space: pre-wrap; } <translation>&Importați</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Editează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>&Partajează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Jurnal nou</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nou</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Deschide jurnal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Deschide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Salvează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Salvează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Sa&lvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Închide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Închide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Printează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>P&referințe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Închide</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Importă din computerul de &scufundări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importă &datele GPS din serviciul web Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Editează numele &dispozitivelor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Adăugați scufundări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Editează scufundarea</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Copiază componetele scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Lipește componentele scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renumerotează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Grupare &automată</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Statistici anuale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Lista scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Informații</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Toate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>DC& anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Următorul DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Despre Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Manual &utilizator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Harta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanul scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importați fișierele cu înregistrări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>&Importați înregistrările scufundărilor din alte aplicații</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importă &de pe divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Expandare ecran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Comutați ecranul expandat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Verifică ultimele actualizări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exportă</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exportați înregistrările scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Configurați &calculatorul de scufundări</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Editează &scufundarea din planificator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Comutați graficul pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Comutați graficul pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Comutați graficul pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Comutați rapoartele plafonului DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Comutați plafoanele calculate</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Comutați calculul țesăturilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Comutați plafoanele calculate incremental cu 3m</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Comutați pulsul</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Comutați MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Comutați EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Comutați NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Comutați rata SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Comutați conducătorul</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Scalați graficul</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Comutați imaginile</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Afisare sau nu bara presiune</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrați lista scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Alterneaza afișarea diagramei de saturație a țesuturilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Chestionar &utilizator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Anulează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Refă</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Caută imaginile mutate</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Deschide stocarea în cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Salvează în cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Administrează locațiile scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Editarea locației scufundării</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Stocare cloud activa</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Conectați-vă la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Deconectați-vă de la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Deschideți fișier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Incercare de unire scufundări cu interval de %1min între</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Sablonul a fost salvat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4908,214 +4967,214 @@ sabloanele implicite sunt numai pentru citire si nu ar trebui editate direct deoarece aplicatia le poate suprascrie la pornire.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Va rugam salvati sau anulati editarea curenta a scufundarii inainte de a trece online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Aveti modificari nesalvate. Vreti sa le salvati in cloud? Daca raspundeti nu, sincronizarea cu cloud-ul se va face la urmatoare apelare a functiei "Deschidere stocare cloud" sau "Salvare in cloud".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Eroare in accesarea stocarii in cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a închide fișierul.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să adăugați o scufundare.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Printați tabelul de execuție</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Încercare de replanificare scufundare ce nu este o scufundare planificată</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Statistici anuale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>Fisiere jurnal scufundare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Fisiere Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>Fisiere MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>Editor jurnale APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Toate fisierele</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Doriți să salvați modificările efectuare în fișierul %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Doriți să salvați modificările efectuare în fișierul de date?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Doriți să salvați modificările?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Modificările vor fi pierdute dacă nu le salvați.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[cache local pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[intregistrare din cloud pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Deschidere fisier de date din o versiune mai veche</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>A-ți deschis un fisier cu date din o versiune mai veche a Subsurface. Recomandăm citirea manualului pentru a afla despre schimbările din noua versiune, în special despre administrarea locurilor de scufundare, modul a suferit modificări majore. Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificați noul sistem de administrare a locurilor de scufundare și să vă asigurați că totul a decurs fără erori.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Deschideți înregistrările scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Se contactează serviciul cloud</translation> </message> @@ -5172,7 +5231,7 @@ Modulele QML QtPositioning si QtLocation posibil sa lipseasca!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filtrele afișează %1 (din %2) scufundări</translation> </message> @@ -5180,12 +5239,12 @@ Modulele QML QtPositioning si QtLocation posibil sa lipseasca!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Ar trebui să actualizați versiunea de firmware de pe calculatorul de scufundări: versiunea curentă este %1 în timp ce ultima versiune stabilă este %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5194,27 +5253,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și pentru descărcarea unui jurnal de scufundări înainte de continuarea actualizării. </translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Nu acum</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Actualizare firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Notificare de actualizare firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Salvați firmware-ul descărcat ca</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Fisiere firmware</translation> </message> @@ -5352,8 +5411,8 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Nici un fișier implicit</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5377,6 +5436,7 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5407,29 +5467,54 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Șterge toate setările</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Resetează setările la cele de bază</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Deschide fișierul jurnal implicit</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Fisiere Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5584,8 +5669,8 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>Recalculeaza vedferea mica daca e mai veche ca imaginea</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5624,7 +5709,7 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>Afișează adâncimea medie în Profil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5703,27 +5788,27 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>Pentru a încărca corect o nouă limbă trebuie să restartați Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Acestea vor fi folosite ca atare. S-ar putea sa nu fie ceea ce a-ti intentionat. A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Caractere literale</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>Caracter(e) ne-speciale in formatarea timpului. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>Caracter(e) ne-speciale in formatarea datei. @@ -5775,7 +5860,7 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Stocare cloud subsurface</translation> </message> @@ -5800,73 +5885,58 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Salvați parola local?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Serviciile web Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID utilizator implicit</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Salvați ID-ul utilizatorului local?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Rețea</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Fără proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Sistemul proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>Proxy HTTP</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Modificari ignorate. Adresa de email si parola locatiei de stocare in cloud poate contine doare litere, numere si '.', '-', '_', si '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Modificari ignorate. Adresa de email si noua parola a locatiei de stocare in cloud poate contine doare litere, numere si '.', '-', '_', si '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mailul și parola de cloud pot conține doar litere, numere și '.', '-', '_', și '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Credențialele Subsurface cloud (credențiale verificate)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Stocare in cloud Subsurface (parola incorecta)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Stocare in cloud Subsurface (PIN necesar)</translation> </message> @@ -6195,133 +6265,133 @@ Va rugam exportati sablonul in alt fisier.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation>(#%1 din %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Calculator de scufundări necunoscut</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Arată NDL / TTS a fost dezactivat din cauza timpului excesiv de procesare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Adaugă gazul modificat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Definește ca primul computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Scufundare planificată</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Scufundare adăugată manual</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Șterge acest computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (but. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Adaugă schimbare de setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Adaugă marcaj</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>Schimba modul de scufundare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Modifică profilul</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Șterge evenimentul</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Ascunde evenimente similare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Modifică numele</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusteza presiuneal but. %1 (mementan interpolata ca %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Arată toate evenimentele</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Ascunde evenimente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Ascunde toate %1 evenimentele?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Înlătură evenimentul selectat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Modifică numele marcajului</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Nume presonalizat:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Numele este prea lung</translation> </message> @@ -6329,53 +6399,53 @@ Va rugam exportati sablonul in alt fisier.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Se incarcă...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Deschide fișier local cu scufundări</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Eroare deschidere fișier cu scufundări local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 scufundări încărcate din fișier local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>operare în mod local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Eroare in parsarea stocarii locale, se renunta</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>utilizator/parola pentru cloud lipsesc</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Va rugam introduceti utilizator/parola pentru cloud valide.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mailul și parola de cloud pot conține doar litere, numere și '.', '-', '_', și '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Format invalid a adresei de e-mail</translation> </message> @@ -6425,50 +6495,50 @@ Va rugam exportati sablonul in alt fisier.</translation> <translation>Nu se poate conecta la cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Utilizator/parola cloud valide, incacare scufundari...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Eroare cloud: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Incarcare scufundari de pe local (mod 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Eroare de conectare la serverul cloud, revenire la local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Accesare cloud cu succes. Nici o scufundare in tabel.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Locatie GPS necunoscuta</translation> </message> @@ -6476,7 +6546,7 @@ Va rugam exportati sablonul in alt fisier.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Se incarcă...</translation> </message> @@ -6568,116 +6638,126 @@ Va rugam exportati sablonul in alt fisier.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Parametri</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Nedefinit</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Combinatie utilizator/parola incorecta</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Datele de conectare trebuie verificate</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Date de conectare verificate</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Mod fara Cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Stare cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Nu se aplica</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Schimbare</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Stare</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Temă</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Albastru</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>text obișnuit</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Scoatere în evidență</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Roz</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Întunecat</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Serviciul web de date GPS Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Prag distanță (metri)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Prag timp (minute)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Tub implicit</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Butelie:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Dezvoltator</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Afisare meniu Developer</translation> </message> @@ -6712,16 +6792,14 @@ Va rugam exportati sablonul in alt fisier.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Atentie! -Nu toate imaginile au data in intervalul 30 minute inainte si 30 minute dupa -sfarsitul scufundarii selectate.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Incarca imaginile chiar daca ora nu coincide cu intervalul scufundarii</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6744,39 +6822,39 @@ sfarsitul scufundarii selectate.</translation> <translation>Ce dată și ce oră sunt afișate pe imagine?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Deschide fișierul cu imaginea</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Fisiere imagine</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>Data/Ora a scufundarii selectare</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>Data/Ora a primei scufundari selectare</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>Data/Ora a ultimei scufundari selectare</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Fisiere cu data/ora neconforme</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Nu exista informatie Exif despre data/ora</translation> </message> @@ -6869,28 +6947,28 @@ Fisiere cu data/ora neconforme</translation> <translation>Mesaje de importare (erori, avertismente, etc)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Deschidere fisiere SmartTrack</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>Fisiere SmartTrack</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Toate fisierele</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Fisiere Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Deschidere fisiere Subsurface</translation> </message> @@ -6898,64 +6976,64 @@ Fisiere cu data/ora neconforme</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Mic</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mediu</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Timpul scufundării: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durata: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Locația scufundării: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Însoțitor: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Maestru scufundări: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7092,65 +7170,17 @@ Fisiere cu data/ora neconforme</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Introduceți ID-ul utilizatorului si apăsați pe butonul de Descărcare</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Serviciu Web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Se conectează...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>S-a terminat descărcarea</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Eroare la descărcare: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Eroare la conectare:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Identificator de utilizator invalid!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Nu se poate parsa răspunsul!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Descărcare cu succes</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Costume:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Niciun costum setat</translation> </message> @@ -7281,39 +7311,44 @@ Fisiere cu data/ora neconforme</translation> <translation>Nivel Zoom</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Încărcarea imaginilor din fișier</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Încărcarea imaginilor de pe web</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Stergere scufundari selectate</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Stergere toate imaginile</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>Recalculeaza vederile mici selectate</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Se sterg toate imaginile</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Sigur doriti stergerea tuturor imaginilor?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7480,15 +7515,15 @@ mixate cu aer și folosite:</translation> <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Etichete: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Etichete</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Etichete goale</translation> </message> @@ -7687,7 +7722,7 @@ mixate cu aer și folosite:</translation> <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1click pentru deschidere %2</translation> </message> @@ -7711,130 +7746,135 @@ mixate cu aer și folosite:</translation> <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 afisat)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Adâncime(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Butelie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>CNS Max.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Etichete</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Însoțitor</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Greutate(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Fotografii înainte/în timpul/după scufundare</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Tara</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Locație</translation> </message> @@ -7848,81 +7888,81 @@ mixate cu aer și folosite:</translation> </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Introdu adresa URL pentru imagini</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Verifică dacă există actualizări.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface nu a reușit să verifice dacă există actualizări.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>A apărut următoarea eroare:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Vă rugăm verificați conexiunea la internet.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Folosiți ultima versiune Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>O nouă versiune Subsurface este disponibilă.<br/>Apăsați pe:<br/><a href="%1">%1</a><br/> pentru a o descărca.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>O nouă versiune Subsurface este disponibilă.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Ultima versiune este %1, vă rugam verificați %2 pentru descărcare și %3 pentru informații despre cum se poate actualiza softul.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Ultima versiune lansată este </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Server-ul a returnat următoarea informație:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface verifica odata la doua saptamani daca o versiune noua este disponibila. Daca nu doriti ca Subsurface sa continue verificarile, va rugam apasati Refuza.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Refuză</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Acceptă</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Verificare automată a actualizărilor</translation> </message> @@ -8098,6 +8138,19 @@ Limba: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8153,12 +8206,12 @@ Limba: %1</translation> <translation>Uploadează</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Operațiunea a expirat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Se transferă datele...</translation> </message> @@ -8184,8 +8237,8 @@ Limba: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Nici o eroare</translation> </message> @@ -8309,7 +8362,7 @@ Medie</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Eroare in parcurgerea header</translation> </message> @@ -8646,9 +8699,9 @@ Medie</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxigen</translation> </message> @@ -8663,131 +8716,131 @@ Medie</translation> <translation>Circuit deschis</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>picioare cubice</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>picioare/minut</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>picioare/secundă</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>aer</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrat</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>curea</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>gleznă</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>placa-spate</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8864,123 +8917,123 @@ Medie</translation> <translation>Nici un profil de scufundare gasit in '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Iesire din stocare (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Transfer din stocare (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Transfer in stocare (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Director local cache %s corupt - nu se poate sincroniza cu cloud Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Nu se poate actualiza cacjhe local cu date noi din cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Stocare cloud Subsurface corupta</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Nu se poate actializa stocare cloud Subsurface, incercati mai tarziu</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Exista divergente intre stocarea locala si cloud. Eroare: combinare nereusita (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Exista divergente intre stocarea locala si cloud. Nu se pot combina schimbarile locale si cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Datele de scufundare locale si cloud desincronizate</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Datele de pe stocarea locala si cloud desincronizate. Eroare: scriere date nereusita (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Probleme cu cache local al datelor cloud Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Datele din cache mutate la %s. Rugam incercati din nou operatiunea.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>Actualizeaza storage local la fel cu cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>Impinge datele locate in cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Incearcare de combinare a datelor locale cu cele din cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Stocare date locale in cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Sincronizare cu cloud</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>Serverul cloud nu poate fi contactat, se folosesc datele locale</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>Conexiune cu cloud realizata, descarcare date</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Sincronizare cu cloud terminata</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Eroare conectare la cloud Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>clonare git a %s nereusita (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Sincronizare fisier date</translation> </message> @@ -9079,119 +9132,119 @@ Medie</translation> <translation>numărul evenimentul este invalid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Scufundarea %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Eroare parsând adâncimea maximă</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Eroare parsând temperatura</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Eroare parsând valoarea amestecului de gaz</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Eroare obținând salinitatea apei</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Eroare obținând presiunea la suprafață</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Eroare obtinere mod scufundare</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Eroare parsând amestecul de gaz</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nu s-a putut crea parser pentru %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Eroare înregistrând datele</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Scufundarea %s deja descarcata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Eroare accesare dispozitiv %s %s (%s). In majoritatea cazurilor, pentru a afla mai multe, este de folos trimiterea logurilor catre dezvoltatori. Puteti sa le copiati in clipboard din panoul Despre.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9200,13 +9253,13 @@ In majoritatea cazurilor, pentru a afla problemele, un jurnal libdivecomputer va Poti crea acest jurnal selectand casuta corespunzatoare in fereastra de descarcare.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Nici o scufundare noua descarcata din computer</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>mai multe locatii GPS pentru aceasta locatie; deasemenea %s @@ -9214,19 +9267,19 @@ Poti crea acest jurnal selectand casuta corespunzatoare in fereastra de descarca </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>nume aditional pentru locatie: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Scufundari incarcate din cache local</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Date de scufundare accesate cu succes</translation> </message> @@ -9249,12 +9302,12 @@ Poti crea acest jurnal selectand casuta corespunzatoare in fereastra de descarca </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Nu s-a putut parsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> @@ -9285,8 +9338,8 @@ Poti crea acest jurnal selectand casuta corespunzatoare in fereastra de descarca <translation>, GF=%d/%d real</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>Schimbare SP</translation> </message> @@ -9548,17 +9601,17 @@ Poti crea acest jurnal selectand casuta corespunzatoare in fereastra de descarca <translation>valoare pO₂ mică %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Gazul %s nu a fost găsit</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9567,84 +9620,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Decompresie: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Oprire siguranta: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9653,7 +9706,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9662,175 +9715,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densitate: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Oprire siguranta: timp necunoscut @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Decompresie: timp necunoscut @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>În decompresie </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Decompresie: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>În decompresie (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Limita calculată %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Țesut %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>ICD in primele tesuturi </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>producere: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>adâncimea medie pana aici %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9879,142 +9932,142 @@ EADD: %d%s / %.1fg/ℓ <translation>V</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>AER</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mai mult de %1 zile</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXIGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Nu se poate deschide fișierul %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Număr</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Timp</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Temperatura aerului</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Temperatura apei</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Scufundări</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandare totală</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Colapsare separată</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Excursii</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistici</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Căutare avansată</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Vizibilitate</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Maestru scufundare</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Însoțitor</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Costum</translation> </message> @@ -10025,180 +10078,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Etichete</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notițe</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Afișează mai multe detalii</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Statistici anuale</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>An</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Timp total</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Timp mediu</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Cel mai scurt timp</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Cel mai lung timp</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Adâncime medie</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Adâncime minimă</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Adâncime maximă</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>SAC mediu</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>SAC minim</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>SAC maxim</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Temperatura medie</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Temperatura minimă</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Temperatura maximă</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Întoarcere la liste</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Scufundare #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Profil scufundare</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Infomații scufundare</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Echipament scufundare</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tip</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Mărime</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Presiune de lucru</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Începutul presiunii</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Sfârșitul presiunii</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Evenimente</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Nume</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Valoare</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Coordonate</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Starea scufundării</translation> </message> @@ -10228,62 +10281,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Toate (folosinf statistici excursie)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Iun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Iul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Noi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10534,12 +10587,17 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Adâncime maximă:</translation> @@ -10565,77 +10623,77 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Notițe</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Construit</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Scufundat</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Data scufundare</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Motiv</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationalitate</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Santier</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Tip Nava</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Lungime</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Lungime</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Linie plutire</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Tonaj</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Incarcatura</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Date epava</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Altitudine</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Adâncime</translation> </message> @@ -10680,27 +10738,27 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Oras</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Start salvare date</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Start salvare scufundari</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Creare cache local terminat</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Pregatire salvare date</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>schimbare mod</translation> </message> @@ -10715,7 +10773,7 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Elimină acest punct</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Nu salva un jurnal gol in cloud</translation> </message> @@ -10735,22 +10793,22 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Maxim</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Răspuns invalid de la server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Tag XML așteptat 'DiveDateReader', dar s-a întâmpinat „%1”</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Tag-ul XML așteptat 'DiveDates' nu a fost găsit</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Răspuns XML incorect. Linia %1: %2</translation> </message> @@ -10763,112 +10821,102 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Lista scufundari</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Administrare scufundari</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>Dezactiveaza sincronizarea automata cu cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Activeaza sincronizarea automata cu cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Dezactivare serviciu localizare</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Parametri</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Adauga scufundare manual</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Descarca din DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Sincronizare manuala cu cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Oprirea sincronizarii automate cu cloud face ca toatedatele sa fie stocate local. Aceasta poate fi folositor in situatii cu access limitat la retea. Folositi "Mod manual de sincronizare cloud" daca dispuneti de conectare la retea si doriti sincronizarea datelor cu cloud.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Ajutor</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Incarcă datele GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Aplica pozitii GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Descarcă datele GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Arată cache GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Goliți cache GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Dezvoltator</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Jurnal aplicație</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Informații despre tip interfață</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Despre</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Porniți serviciul de localizare</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 1e2bfd093..204a576c0 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -167,160 +167,160 @@ <translation>Сканирование устройств...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Сканирование завершено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Локальное устройство Bluetooth было %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>включено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>выключено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>Не сопряжено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>Сопряжено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>Авторизовано,Сопряжено</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Состояние: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для подключения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Чтобы использовать %1, оно должно быть сопряжено. Используйте контекстное меню для сопряжения.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Устройству нужен ненулевой адрес для подключения.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Локальное устройство было изменено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Сопряжение</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Удалить сопряжение</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Попытка сопряжения с %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Попытка удалить сопряжение с %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Устройство %1 не сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Устройство %1 сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Устройство %1 авторизовано и сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для соединения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Ошибка локального устройства: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Ошибка сопряжения. Если устройство требует специальный PIN-код, попробуйте сопряжение средствами операционной системы.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Неизвестная ошибка</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Адаптер Bluetooth выключен, включите его перед выполнением поиска.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Ошибка по время чтения/записи устройства.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Произошла неизвестная ошибка.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Ошибка обнаружения устройства: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Недоступно</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Ошибка доступа к локальному Bluetooth-адапетру.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Адрес %1 не соответствует ни одному адресу локального устройства Bluetooth. Обнаружение не будет выполнено.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Люди:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Поиск партнеров и инструкторов</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Без напарника</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Создать рез. копию настроек</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML-ошибка при создании рез. копии</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ошибка при сохранении резервной копии. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Резервная копия создана</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Ваши настройки сохранены в %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Восстановить настройки дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML-ошибка при восстановлении</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ошибка при восстановлении из рез. копии. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Восстановление успешно</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Настройки были успешно восстановлены.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Выберите файл прошивки</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Подключение к устройству...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Устройство подключено</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Устройство отключено</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> @@ -1973,22 +1973,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Детали погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Отмена редактирования</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> @@ -1996,104 +1996,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Погружение %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Дата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Место:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Координаты:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Использовать текущее местоположение GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Глубина:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Длительность:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Баллон:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Смесь:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Нач. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Кон. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Заметки:</translation> </message> @@ -2262,104 +2294,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Разбить выделенные погружения</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 не является картинкой</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Открыть файлы изображений</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Все файлы</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 не является картинкой</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Светлая</translation> </message> @@ -2570,121 +2617,121 @@ GPS location:</source> <translation>Песочная</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Распространенный формат, используемый для обмена данными между различными дайверскими программами.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Профиль погружения в виде значений, разделенных запятой.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Информация о погружении в виде значений, разделенных запятой. Включает почти все детали кроме профиля.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Отправить данные погружения на сайт divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Отправить данные погружения на сайт dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML экспорт мест погружений на карте мира.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Собственный XML-формат Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Выгружает имена фотографий и глубины, на которых они были сделаны.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Сохранить погружение как макрос TeX.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Файл для UDDF экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>Файлы UDDF</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>Файлы CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>Файлы HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>Файлы TeX</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Файл для CSV экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Файл для экспорта карты</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Экспорт Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Экспорт глубин фотографий</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Экспорт в TeX-файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Экспортировать HTML файл как</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Ожидайте, идет экспорт...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> @@ -3044,62 +3091,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>балл.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Фотографии</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Партнер</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Фото до/во время/после погружения</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>не выбраны погружения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Не найден стиль для экспорта в divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>не удалось создать ZIP файл для загрузки: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>внутренняя ошибка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Ошибка преобразования погружения %1 в формат divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>ошибка сохранения zip-файла: %s ошибка %d системная ошибка %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Невозможно открыть архив: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Выберите режим загрузки по Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> - <translation type="unfinished"/> + <translation>Соединение с дайв-компьютером</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Ошибка</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Повторить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth выключен</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Производитель : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Дайв-компьютер:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Соединение:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Информация:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Соединение с Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Чтобы отключиться от Facebook, используйте пункт меню "Поделиться".</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Успешная авторизация Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Погружение выгружено в ленту Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3932,23 +3996,23 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> <source>Scanning:</source> - <translation type="unfinished"/> + <translation>Сканирование</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> @@ -3958,32 +4022,32 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Сканировать директории с фото</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> <source>Stop scanning</source> - <translation type="unfinished"/> + <translation>Остановить сканирование</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation type="unfinished"/> + <translation>Сканирование отменено; результаты могут быть неполными</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Места:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Местонахождение</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(те же данные GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (удаление ~%1</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, здесь %n дайв)</numerusform><numerusform>, здесь %n дайва)</numerusform><numerusform>, здесь %n дайвов)</numerusform><numerusform>, %n dive(s) here)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(нет данных GPS, скопировать из этого погружения)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(нет данных GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Выбрать: </translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Место не указано</translation> </message> @@ -4242,8 +4306,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Основное</translation> </message> @@ -4264,19 +4328,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -4357,8 +4421,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Фотографии</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ p, li { white-space: pre-wrap; } <translation>Добавить грузовую систему</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4470,424 +4534,419 @@ p, li { white-space: pre-wrap; } <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>Редактирование</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Поделиться</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Импорт координат из веб-сервиса Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Названия дайвкомпьютеров</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>Редактировать погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Копировать параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Вставить параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Карта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Экспорт </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Настройки дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Редактировать в планировщике</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Фотографии</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Газы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Насыщение тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>Опрос пользователей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>Повторить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>Найти перемещенные фото</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Открыть облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Сохранить в облаке</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Редактирование дайв-сайта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Облачное хранилище подключено</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4901,213 +4960,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>Файлы MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5163,7 +5222,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> @@ -5171,12 +5230,12 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Вам следует обновить прошивку дайвкомпьютера: текущая версия %1, а последняя стабильная версия %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5185,27 +5244,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Если вы подключаетесь через Bluetooth, выполните те же приготовления, что и перед загрузкой погружений, прежде чем выполнять обновление.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Не сейчас</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Обновить прошивку</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Примечание по обновлению прошивки</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Сохранить загруженную прошивку как</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Файлы прошивки</translation> </message> @@ -5343,8 +5402,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Отсутствует</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5368,6 +5427,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5398,29 +5458,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Очистить все настройки</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Сбросить все настройки в значение по умолчанию</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Общие</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Выберите журнал по умолчанию</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5566,7 +5651,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/> <source>Show warnings for isobaric counterdiffusion</source> - <translation type="unfinished"/> + <translation>Показывать предупреждения о контрдиффузии</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/> @@ -5575,7 +5660,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5615,7 +5700,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Показывать среднюю глубину на профиле</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Профиль</translation> </message> @@ -5694,28 +5779,30 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Специальные символы</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> - <translation type="unfinished"/> + <translation>Неизвестные символы в формате времени. +</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> - <translation type="unfinished"/> + <translation>Неизвестные символы в формате даты. +</translation> </message> </context> <context> @@ -5763,7 +5850,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Облачное хранилище Subsurface</translation> </message> @@ -5788,73 +5875,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Хранить пароль локально?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Веб-сервис Subsurface</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>ID пользователя</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Сохранять ID пользователя</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Без прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Системный прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Облачное хранилище Subsurface (данные подтверждены)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Облачное хранилище Subsurface (неверный пароль)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Облачное хранилище Subsurface (нужен PIN)</translation> </message> @@ -6182,133 +6254,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6316,53 +6388,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6384,7 +6456,7 @@ Please export this template to a different file.</source> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Incorrect cloud credentials</source> - <translation type="unfinished"/> + <translation>Неверная облачная учетная запись</translation> </message> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="553"/> @@ -6412,50 +6484,50 @@ Please export this template to a different file.</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> - <translation type="unfinished"/> + <translation>Облачная учетная запись верна, загрузка погружений...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6463,7 +6535,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Запуск...</translation> </message> @@ -6555,118 +6627,128 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Неверные логин/пароль</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Необходима проверка учетной записи</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Учетная запись проверена</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Эл. почта</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Состояние</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Синий</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Веб-сервис GPS Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Пороговое расстояние (метры)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Пороговое время (минуты)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Баллон по умолчанию</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Баллон:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> - <translation type="unfinished"/> + <translation>Показать меню разработчика</translation> </message> </context> <context> @@ -6699,16 +6781,14 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Внимание! -Не у всех фото время попадает в интервал 30 минут -до или 30 минут после времени выбранного погружения.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Загрузить фото даже если время погружения не совпадает</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6731,40 +6811,40 @@ Not all images have timestamps in the range between <translation>Какое время и дата отображены на изображении?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Открыть файл с изображением</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> - <translation type="unfinished"/> + <translation>Не найдены дата/время Exif</translation> </message> </context> <context> @@ -6855,28 +6935,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Открыть файлы SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> - <translation type="unfinished"/> + <translation>Файлы SmartTrak</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Открыть файлы Subsurface</translation> </message> @@ -6884,64 +6964,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Средняя</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Дата погружения: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Длительность: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Местоположение: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Партнер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Дайвмастер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7078,65 +7158,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Укажите КЛЮЧ и нажмите Загрузить</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Вебсервис</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Соединение...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Загрузка завершена</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Ошибка загрузки: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Ошибка соединения:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Неверный идентификатор пользователя!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Невозможно разобрать ответ!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Загрузка завершена</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Костюмы:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Костюм не указан</translation> </message> @@ -7264,42 +7296,47 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/> <source>Zoom level</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Загрузить фото из файлов</translation> + <translation>Масштаб</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Загрузить фото из Web</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Удалить выбранные изображения?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Удалить все изображения</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Удаление изображений</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Удалить все изображения?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7467,15 +7504,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Метки:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Метки</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Без меток</translation> </message> @@ -7674,7 +7711,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -7698,130 +7735,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation> (показано %1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Партнер</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Фото до/во время/после погружения</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -7835,81 +7877,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Введите URL для фото</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Проверить обновления.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Не получилось проверить наличие обновлений.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Возникла ошибка:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Проверьте Интернет-соединение.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Вы используете актуальную версию Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Доступна новая верся Subsurface.<br/>Кликинте по:<br/><a href="%1">%1</a><br/>, чтобы скачать.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>Доступна новая версия Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Последняя версия %1, передите на %2 нашу страницу загрузки %3 чтобы узнать как обновиться.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Последняя версия</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Сервер вернул следующую информацию:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Каждый две недели Subsurface проверяет наличие новой версии. Если вы не хотите проверять обновления, нажмите "Отказываюсь".</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Отказаться</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Автоматическая проверка обновлений</translation> </message> @@ -8085,6 +8127,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8140,12 +8195,12 @@ Language: %1</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -8171,8 +8226,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Без ошибок</translation> </message> @@ -8296,7 +8351,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> @@ -8632,9 +8687,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8649,131 +8704,131 @@ Maximum</source> <translation>Открытый цикл</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>Па</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>л</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>м/с</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>фут/с</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>воздух</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>спинка</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>карабины</translation> </message> @@ -8850,123 +8905,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Облачное хранилице поверждено</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Данные в локальном и облачном хранилице отличаются</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Проблема с локальным кэшем облачного хранилища</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> - <translation type="unfinished"/> + <translation>Успешное соединение с облаком, получение данных</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9065,131 +9120,131 @@ Maximum</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Ошибка разбора температуры</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Ошибка при получении режима погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s @@ -9197,19 +9252,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>другое название дайв-сайта: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> - <translation type="unfinished"/> + <translation>Загрузить погружения из локального кэша</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9232,12 +9287,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -9268,8 +9323,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>изменение SP</translation> </message> @@ -9531,17 +9586,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9550,84 +9605,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Ост. без-ти: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>Д: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9636,7 +9691,7 @@ EADD: %d%s / %.1fг/л </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9645,173 +9700,173 @@ EADD: %d%s / %.1fг/л </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Ост. без-ти: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/мин</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> @@ -9860,142 +9915,142 @@ EADD: %d%s / %.1fг/л <translation>З</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>КИСЛОРОД</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Номер</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Погружения</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Поездки</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Расширенный поиск</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Костюм</translation> </message> @@ -10006,180 +10061,180 @@ EADD: %d%s / %.1fг/л </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Подробнее</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Год</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Общее время</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Среднее время</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Мин. время</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Макс. время</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Сред. глуб.</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Мин. глуб.</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Средний SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Мин. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Макс. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Сред. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Мин. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Макс. темп.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Вернуться к списку</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Профиль погружения</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Информация о погружении</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Объем</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Раб. давл.</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Нач. давл.</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Кон. давл.</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>События</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Название</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Значение</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Координаты</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Статистика погружения</translation> </message> @@ -10209,62 +10264,62 @@ EADD: %d%s / %.1fг/л <translation>Все (статистика по поездкам)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -10515,12 +10570,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>с</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Макс. глуб.:</translation> @@ -10546,77 +10606,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Заметки:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Построен</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Затонул</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Затонул</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Причина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Порт приписки</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Верфь</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Тип судна</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Длительность</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Ширина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Водоизмещение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Водоизмещение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Карго</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Данные рэка</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Высота</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Глубина</translation> </message> @@ -10661,27 +10721,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Город</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> - <translation type="unfinished"/> + <translation>Начало сохранения данных</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> - <translation type="unfinished"/> + <translation>Начало сохранения пошружений</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> - <translation type="unfinished"/> + <translation>Локальный кэш создан</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> - <translation type="unfinished"/> + <translation>Подготовка к сохранению данных</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10696,7 +10756,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Удалить эту точку</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10716,22 +10776,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Максимум</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> @@ -10744,112 +10804,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Мобильный Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Включить синхронизацию с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Выгрузить данные GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Загрузить данные GPS</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 1121e3388..3a2fa54d2 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Osoba:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Vyhľadávanie partnerov a divemastrov</translation> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Žiaden partner</translation> </message> @@ -1658,102 +1658,102 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Nastavenie záložného počítača</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>Chyba XML zálohy</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Chyba počas ukladania zálohy. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Vytvorenie zálohy úspešné</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Nastavenie bolo uložené do: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Obnova nastavenia počítača</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>Chyba XML obnovy</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Pri obnove zálohy nastala chyba. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Úspešná obnova</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Nastavenia boli obnovené úspešne.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Vyber súbor s firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1969,22 +1969,22 @@ vybraný počítač?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Zmazať ponor</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1992,103 +1992,135 @@ vybraný počítač?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Dátum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Miesto:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Hĺbka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Trvanie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Závažie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> @@ -2257,104 +2289,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandovať všetky</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Zredukovať všetky</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Zbaliť ostatné</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Vymazať ponor(y) z akcie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Vytvoriť novú akciu nad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Pridať ponor(y) do akcie hneď nad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Pridať ponor(y) do akcie hneď pod</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Spoj akciu s akciou nad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Spoj akciu s akciou pod</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Zmazať ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Neplatný ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Spojiť vybraté ponory</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Prečíslovanie ponorov</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Otvoriť súbory s obrázkami</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2555,7 +2602,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Svetlo</translation> </message> @@ -2565,121 +2612,121 @@ GPS location:</source> <translation>Piesok</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Všeobecný formát používaný pre výmenu dát medzi rôznymi potápačskými programami.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Odoslať dáta o ponore na stránku divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML export potápačskej lokality zobrazenej na mape sveta.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface XML formát.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exportovať UDDF súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exportovať CSV súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exportovať mapu sveta</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportovať </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exportovať HTML súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Neviem otvoriť súbor %s</translation> </message> @@ -3039,62 +3086,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Cieľová hĺbka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Aktuálny čas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Použitá zmes</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Mód ponoru</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3295,261 +3342,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Značky</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotografie</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>neboli vybrané žiadne ponory</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>vytvorenie zip súboru pre upload zlyhalo: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>interná chyba</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Hotovo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Nahrávanie zoznamu ponorov...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Sťahovanie zoznamu ponorov...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Sťahovanie %1 ponorov...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Sťahovanie ukončené %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Nemôžem otvoriť archív: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Poškodené sťahovanie</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Nemôžem otvoriť archív: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Nahrávanie ukončené</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Nahrávanie zlýhalo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Úspešne nahrávanie</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Prihlásenie zlýhalo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Neviem spracovať odpoveď</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> @@ -3557,23 +3610,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Stiahnutie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -3583,42 +3636,47 @@ p, li { white-space: pre-wrap; } <translation>Hladať Uemis DC</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Uloženie dump súboru pre libdivecomputer spôsobí nenahratie ponorov do zoznamu ponorov.</translation> </message> @@ -3690,9 +3748,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Stiahnutie</translation> </message> @@ -3718,7 +3776,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> @@ -3733,57 +3791,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Skús znovu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Koniec</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Akceptovať</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Vybrať všetky</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3814,12 +3878,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3827,22 +3891,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3858,17 +3922,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Vybrať všetky</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3923,17 +3987,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3949,7 +4013,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3964,17 +4028,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4067,40 +4131,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Miesto:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Miesto</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4108,7 +4172,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4232,8 +4296,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -4254,19 +4318,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -4347,8 +4411,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotografie</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4381,53 +4445,53 @@ p, li { white-space: pre-wrap; } <translation>Pridať závažia</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Teplota vzduchu [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Teplota vody [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Táto akcia je editovaná.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Viaceré ponory sú editované.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Tento ponor sa edituje.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Vymazať zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Chystáš sa vymazať zmeny.</translation> </message> @@ -4460,424 +4524,419 @@ p, li { white-space: pre-wrap; } <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Nový logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Nový</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Otvoriť logbook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Otvor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Uložiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Uložiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Uložiť a&ko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Uložiť ako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Zatvoriť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Zatvoriť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Tlačiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Na&stavenia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Ukončiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Import z &počítača</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Import &GPS data zo Subsurface webu</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Pridanie ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>&Kopírovať údaje z ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>&Vložiť údaje z ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Prečisluj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>&Automatické zoskupovanie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Ročné štatistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Zoznam &ponorov</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Všetko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>P&redchádzajúci DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Nasledujúci DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&O Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Uživateľský &manuál</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lánovanie ponoru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>Import z &log súborov</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Import log súborov z iných aplikácii</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Import z &</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Celá obrazovka</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Prepnúť celú obrazovku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Kontrola novšej verzie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exportovať všetko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Konfigurácia počítača</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Prepnúť pO₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Prepnúť pN₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Prepnúť pHe graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Prepnúť zobrazenie stropu podľa počítača</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Prepnúť na vypočítaný strop</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Prepnúť výpočet všetkých tkanív</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Prepnúť na </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Prepnúť tepovú frekvenciu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Prepnúť MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Prepnúť </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>Prepnúť NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Prepnúť SAC spotrebu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Prepnúť pravítko</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Prepnúť fotografie</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtruj zoznam ponorov</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4891,212 +4950,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred zatvorením súboru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred pridaním nového ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Ročná štatistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmeny budu stratené ak ich neuložíš.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5152,7 +5211,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter zobrazuje %1 (z %2) ponorov</translation> </message> @@ -5160,39 +5219,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Firmware update</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5330,7 +5389,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5355,6 +5414,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5385,29 +5445,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Zmazať všetky nastavenia</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Nastaviť všetky nastavenia na pôvodné hodnoty</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Otvoriť predvolený Log súbor</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5562,7 +5647,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5602,7 +5687,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5681,25 +5766,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Na korektné nahratie nového jazyka je potrebné reštartovať Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5750,7 +5835,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5775,73 +5860,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface Webservice</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Predvolené užívateľské ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Uložiť uživateľské ID lokálne?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Sieť</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Žiadne proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>Systémové proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6169,133 +6239,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Pridaj zmenu zmesi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Pridať Bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Vymazať udalosť</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Schovaj podobné udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Editovať meno</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Zobraziť všetky udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Schovaj udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Schovať všetky %1 udalosti?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Zmazať vybrané udalosti?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Editovať meno záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Voliteľné meno:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Príliš dlhý názov!</translation> </message> @@ -6303,53 +6373,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6399,50 +6469,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6450,7 +6520,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6542,116 +6612,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Nastavenia</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Stav</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Téma</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Modrá</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Predvolená fľaša</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6686,13 +6766,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6716,38 +6796,38 @@ Not all images have timestamps in the range between <translation>Aký dátum a čas je zobrazený na fotke?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Otvoriť súbory s obrázkami</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6840,28 +6920,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6869,59 +6949,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Stredný</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7057,65 +7137,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Zadaj ID užívateľa a klikni na Stiahnutie</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservis</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Pripájam...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Sťahovanie ukončené</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Chyba sťahovania: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Chyba spojenia:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Neplatný identifikátor užívateľa!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Nemôžem spracovať odpoveď!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Sťahovanie úspešné</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Obleky:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7246,38 +7278,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7446,15 +7483,15 @@ vytvorene zo vzduchu a: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Značky:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Značky</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Žiadne značky</translation> </message> @@ -7653,7 +7690,7 @@ vytvorene zo vzduchu a: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7677,130 +7714,135 @@ vytvorene zo vzduchu a: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Značky</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Buddy</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -7814,80 +7856,80 @@ vytvorene zo vzduchu a: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Kontrola novšej verzie.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface nedokázal skontrolovať existenciu novšej verzie.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Vyskytla sa nasledujúca chyba:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Prosím, skontroluj pripojenie na internet.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Používaš poslednu verziu Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Nová verzia Subsurface je k dispozícii.<br/>Klikni na:<br/><a href="%1">%1</a><br/>.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>K dispozícii je nová verzia Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Najnovšia verzia je</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Akceptovať</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8060,6 +8102,19 @@ Jazyk: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8115,12 +8170,12 @@ Jazyk: %1</translation> <translation>Nahratie</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Čas operácie vypršal</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Prenášanie dát...</translation> </message> @@ -8146,8 +8201,8 @@ Jazyk: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8268,7 +8323,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8604,9 +8659,9 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -8621,131 +8676,131 @@ Maximum</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>vzduch</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrované</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>opasok</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>členok</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8822,123 +8877,123 @@ Maximum</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9037,149 +9092,149 @@ Maximum</translation> <translation>neplatné číslo udalosti</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Chyba spracovania času</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Ponor #%d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Chyba spracovania času ponoru</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Chyba spracovania maximálnej hĺbky</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Chyba spracovania teploty</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Chyba spracovania dýchacích zmesí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Chyba získania slanosti vody</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Chyba pri zisťovaní tlaku na povrchu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Chyba spracovania zmesi plynu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Nie je možné spracovať %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Chyba registrácie dát</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9202,12 +9257,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Chyba pri spracovaní '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu %s</translation> </message> @@ -9238,8 +9293,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9503,17 +9558,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Neviem nájsť zmes %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9522,255 +9577,255 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>V deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Vypočítaný strop %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tkanivo %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>smer: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9819,142 +9874,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>Vzduch</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>KYSLÍK</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Neviem otvoriť súbor %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Číslo</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Ponory</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandovať všetky</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Zredukovať všetky</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Akcie</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Štatistika</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Pokročilé vyhľadávanie</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Viditeľnosť</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Oblek</translation> </message> @@ -9965,180 +10020,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Značky</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Zobraziť viac detailov</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Ročná štatistika</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Rok</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Celkový čas</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Priemerný čas</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Najkratší čas</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Najdlhší čas</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Priemerná hĺbka</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Min. hĺbka</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Max. hĺbka</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Priemerná SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Min. spotreba</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Max. spotreba</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Priemerná teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Min. teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Max. teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Spǎť na zoznam</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Ponor #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Profil ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Informácia o ponore</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Vybavenie ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Veľkosť</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Pracovný tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Počiatočný tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Koncový tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Udalosti</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Meno</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Hodnota</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Súradnice</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Stav ponoru</translation> </message> @@ -10168,62 +10223,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10469,12 +10524,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. hĺbka:</translation> @@ -10500,77 +10560,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Poznámky:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Výška</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Hĺbka</translation> </message> @@ -10615,27 +10675,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10650,7 +10710,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Odstrániť tento bod</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10670,22 +10730,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Neplatná odpoveď zo servera</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Očakávaný XML tag 'DiveDates' nebol nájdený</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation> </message> @@ -10698,112 +10758,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Nastavenia</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index f3a3a8194..e663e5ee4 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -167,160 +167,160 @@ <translation>Söker efter externa enheter...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>Sökning avslutad</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>%1 var den lokala blåtandsenheten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>slå på</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>slå av</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>Ej Parkopplad</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>Parkopplad</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>IHOPPARNING_GODKÄND</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Status: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheten %1 måste parkopplas för att kunna användas. Du kan använda kontextmenyn för parkopplingsmöjligheter.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>Enheten behöver en icke-noll adress för anslutning.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>Den lokala enheten uppdaterades.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>Parkoppla</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>Ta bort parkoppling.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>Försök att parkoppla med %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>Försöker ta bort parkopplingen med %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>Parkopplingen med %1 togs bort.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>Parkopplade med %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>Enheten %1 parkopplades och är nu auktoriserad.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>Fel i lokal enhet: %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Parnings fel. Om enheten kräver en speciell PIN kod, vänligen försök para enheterna via operativsystemet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>Okänt fel</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Blåtandsadaptern är avslagen, slå på den innan sökning.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Skriva till eller läsa från enheten resulterade i ett fel.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>Ett okänt fel har uppstått.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>Enhets upptäcknings fel. %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>Inte tillgänglig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Den lokala blåtands adaptern kan inte nås.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Enhets söknings agenten skapades inte därför att adressen %1 stämmer inte med den fysiska adapteradressen för någon lokal blåtandsenhet.</translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>Person:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>Sök efter parkamrater och divemasters</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>Inga parkamrater</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>Säkerhetskopiera dykdatorns inställningar</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>Backupfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML backup fel</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ett fel inträffade när backupfilen skulle sparas. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>Backup sparad</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>Dina inställningar har blivit sparade till: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>Återställ dykdatorns inställningar</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML återställningsfel</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ett fel inträffade när backupfilen skulle återställas. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>Återställda</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>Dina inställningar har blivit återställda</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>Välj en firmware-fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>Alla filer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>Ansluter till enhet...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>Ansluten till enhet</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>Enhet frånkopplad</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> </message> @@ -1973,22 +1973,22 @@ radera den valda dykdatorn?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>Dykdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Radera dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>Avbryt redigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>Visa på kartan</translation> </message> @@ -1996,104 +1996,136 @@ radera den valda dykdatorn?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Dyk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Plats:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>Använd nuvarande GPS position:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Djup:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Varaktighet:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Vattentemperatur:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Vikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>Flaska:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>Gasblandning:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>Starttryck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>Sluttryck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Ranking:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> @@ -2262,104 +2294,119 @@ GPS position:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Fäll samman andra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Ta bort dyk från resa</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Ny resa ovan</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Lägg till dyk(en) till resan ovan</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Lägg till dyk(en) till resan nedanför</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Sammanfoga resa med resan ovan</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Sammanfoga resa med resan under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Radera dyk(en)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Slå samman valda dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Uppdatera numrering</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>Korrigera dyk tider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>Dela markerade dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>Laddar bild(er) från fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>Ladda bild från nätet</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>Bild filer (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 verkar inte vara en bild</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>Bildfiler</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Öppna bildfler</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>Alla filer</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 verkar inte vara en bild</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS position:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Ljus</translation> </message> @@ -2570,121 +2617,121 @@ GPS position:</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Generellt format som används för att utbyta data emellan olika dykrelaterade program. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>Kommaseparerade värden som beskriver dykprofilen</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Dykinformationen i kommaseparerat format . Detta inkluderar de flesta av dykets detaljer men inte dykprofilen.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Skicka dykdatan till divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Skicka dyk datat till dive-share.appspot.com</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-export av dykplatser visualiserade på en världskarta.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface eget XML-format.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>Skriv ljupet av bilderna till fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>Skriv dyk dyk som TeX macro till fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>Exportera som UDDF fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF filer</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface filer</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX filer</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Exportera CSV-fil som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Exportera världskarta</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Exportera Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>Spara bildernas ljup</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>Exportera till TeX fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Exportera HTML filer son</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>Vänligen vänta, exporterar...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>Kan inte öppna fil %s</translation> </message> @@ -3044,62 +3091,62 @@ GPS position:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>flaska</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Löptid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>Dykläge</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>Stopptider</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Flaska</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Taggar</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Bilder</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Parkamrat</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>Ljup(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>Vikt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>Foton före/under/efter dyket</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>inga dyk var markerade</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>mallen för export till divelogs.de kan inte hittas</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>misslyckades med att skapa zipfilen för uppladdning: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>internt fel</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Konvertering av dyk %1 till divelogs.de format misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>fel vid skrivning av zip fil: %s zip fel %d system fel %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Klar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Laddar upp dyklista...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Laddar ner dyklista...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>Laddar ner %1 dyk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>Nedladdning klar - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>Problem med nerladdningen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>Arkiver kunde inte öppnas: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>Misslyckad nedladdning</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunde inte öppnas: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Uppladdning klar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Uppladdning misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Uppladdningen lyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Inloggning misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>Kan inte tolka respons</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>Ladda ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>Välj Blåtands nerladdnings läge</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>Ansluter till dykdator</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Error</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>Hitta Uemis dykdator</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>Avbryt nerladdning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>Dumpfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>Försök igen med nerladdningen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Ladda ned</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>Blåtand är inte aktiverad</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>Tillverkar namn:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>Dykdator:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>Anslutning:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Försök igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Avsluta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>Ny sökning</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>Nerladdade dyk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Markera Samtliga</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Avmarkera alla</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>Anslut till Facebook </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>För att koppla ner Subsurface från ditt Facebook-konto, använd 'Dela på' menyn.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logga in för att koppla Subsurface till Facebook. Det tillgängliggör möjligheten att publicera dyk till din Facebook-timeline.</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Inloggning till Facebook lyckades</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, okänt användar id, kan inte logga in.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>Dyk publicerades till Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Uppladdning av dykdata misslyckades. Vänligen se debug-information och skicka resultatet till sändlistan för Subsurface</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Markera Samtliga</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>Avmarkera alla</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>Invertera markering</translation> </message> @@ -3932,17 +3996,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3958,8 +4022,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>Traversera bild kataloger</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> @@ -3973,17 +4037,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Plats:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Plats</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation>(samma GPS position)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation>(~%1 bort</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dyka här)</numerusform><numerusform>, %n dyk här)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(ingen existerade GPS data, lägg till GPS position för detta dyk)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(ingen GPS data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>Välj plats:</translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>Ingen plats angiven</translation> </message> @@ -4242,8 +4306,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Anteckningar</translation> </message> @@ -4264,19 +4328,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Lufttemp</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Vattentemperatur</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Plats</translation> </message> @@ -4357,8 +4421,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Bilder</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ p, li { white-space: pre-wrap; } <translation>Lägg till viktsystem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Vattentemperatur [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Detta resmål håller på och ändras.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Flera dyk håller på och ändras.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Detta dyk håller på och ändras.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Reseanteckningar</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Resmål</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>Ny dykplats</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Kassera ändringarna?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>Du är påväg att kasta bort dina förändringar</translation> </message> @@ -4470,424 +4534,419 @@ p, li { white-space: pre-wrap; } <translation>&Import</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>&Redigera</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>Dela via</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Ny Loggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Öppna loggbok</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Öppna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Spara</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>Spara som(&v)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Spara som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>Stäng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Stäng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Skriv ut</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>Inställninga&r</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Avsluta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>Ladda ner från dykdator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>Importera &GPSdata från Subsurface webbtjänst</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>Ändra enhetsnamn</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>Lägg till dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>&Redigera dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>Kopiera dykkomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>Klistra in dykkomponenter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Renumrering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Årsstatistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>Dyklista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Alla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>Fö&regående dykdator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>&Nästa dykdator</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>Om Subsurface(&a)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>Användar&manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>&Karta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>P&lanera dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Importera loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Importera loggfiler ifrån andra applikationer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>Importera &från divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Fullskärm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Växla fullskärmsläge</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Sök efter uppdateringar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Exportera</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>Exportera dykloggar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>Konfigurera &dykdatorer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>Redigera &dyk i dykplaneraren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>Växla pO₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>Växla pN₂ graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>Slå av/på pHe grafen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>Slå av/på dykdatorrapporterat takinformation</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Slå av/på beräknad takinformation</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Slå av/på beräkningen av alla vävnader</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Slå av/på beräknad takinformation i 3m steg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Slå av/på hjärtrytm</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>Slå av/på MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>Slå av/på EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation> Slå av/på NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>Slå av/på SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Slå av/på mätverktyget</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>Skala graf</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>Växla bilder</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>Växla gasgrafen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>&Filtrera dyklista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>Växla färgdiagram för vävnader</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>&Användarundersökning</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>&Ångra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>&Gör om</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>&Hitta flyttade bilder</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>Öppna molnlagring</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>Spara till molnlagring</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>&Hanter dykplatser</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>Dykplats redigering</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>Molnlagring aktiv</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>Anslut till</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>Kopplan ner från</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Försöker slå ihop dyk med %1min interval emellan. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>Templat kopia skapad</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4901,213 +4960,213 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du går online.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Aktivering av molnlagring misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Försöker planera om ett dyk som inte är en dykplan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>dykloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD loggvisare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>Alla filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vill du spara ändringarna som du gjort i filen %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vill du spara ändringarna som du gjort i filen?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>Ändringar förloras om du inte sparar dom.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[lokal cache för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[molnlagring för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>Öppnar datafil från en äldre version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Du öppnade en datafil från en äldre version av Subsurface. Vi rekommenderar att du läser manualen för att lära dig om förändringarna i den nya versionen, speciellt om dykplats administrationen som har ändrats signifikant. Subsurface har redan försökt att fylla i datat men det kan vara värt besväret att titta på den nya dykplats administrationen och se till att allt ser bra ut.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>Kontaktar molntjänst...</translation> </message> @@ -5164,7 +5223,7 @@ QML modulerna för QtPositioning samt QtLocation kan saknas!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter visar %1 (av %2) dyk</translation> </message> @@ -5172,12 +5231,12 @@ QML modulerna för QtPositioning samt QtLocation kan saknas!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Du borde uppdatera mjukvaran i din dykdator: du har version %1 men den senaste stabila versionen är %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5186,27 +5245,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa On din enhet använder blåtand, gör samma förberedelser som för loggboks nerladdning innan du fortsätter med uppdateringen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>Inte nu</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>Uppdatera firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>Mjukvaruuppdaterings notis</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>Spara nerladdad firmware som</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>Firmware filer</translation> </message> @@ -5344,8 +5403,8 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>Ingen standardfil</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5369,6 +5428,7 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5399,29 +5459,54 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Rensa alla inställningar</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Återställ alla inställningar till deras standardvärde</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>Allmän</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Öppna standarddykloggen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface filer</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5576,7 +5661,7 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5616,7 +5701,7 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>Visa medeldjup i profilen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5695,25 +5780,25 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>Bokstavliga tecken</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5764,7 +5849,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface molnlagring</translation> </message> @@ -5789,73 +5874,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Spara lösenord lokalt?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface webbtjänst</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Förvalt användarid</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Spara användarid lokalt?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Nätverk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Förändring ignorerad. Epostadress och lösenord till molnlagringen kan endast bestå av bokstäver, siffror och följande tecken '.', '-', '_', samt '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Förändring ignorerad. Epostadress och nytt lösenord till molnlagringen kan endast bestå av bokstäver, siffror och tecken '.', '-', '_', samt '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Molnlagrings email och lösenord kan bara beså av bokstäver, siffror samt '.', '-', '_' och '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface molnlagring (verifierade referenser)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface molnlagring (felaktigt lösenord)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface molnlagring (PIN krävs)</translation> </message> @@ -6184,133 +6254,133 @@ Vänligen exportera mallen till en ny fil.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>Okänd dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Visa NDL / TTS stängdes av pga att det tog för lång tid att beräkna</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>Planera dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>Manuellt tillagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>Ta bort denna dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation>(cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>Lägg till setpoint byte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Lägg till bokmärke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>Editera profilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>Ta bort händelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Göm liknande händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>Ändra namn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>Visa alla händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Göm händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>Göm alla %1händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Ta bort markerad händelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Ändra namnet på bokmärket</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Valt namn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>Namnet är för långt!</translation> </message> @@ -6318,53 +6388,53 @@ Vänligen exportera mallen till en ny fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>Startar...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>Öppna lokal dyklogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>Öppnande av lokal dyklogg misslyckades</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dyk ladade från lokal dyklogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>Arbetar i molnfritt läge</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>Kunde inte läsa lokal lagring, ger upp.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>inga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>Vänligen ange giltiga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Molnlagrings email och lösenord kan bara beså av bokstäver, siffror samt '.', '-', '_' och '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>Ogiltigt format för epostadress</translation> </message> @@ -6414,50 +6484,50 @@ Vänligen exportera mallen till en ny fil.</translation> <translation>Kan inte ansluta till moln lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>Molnreferenser giltiga, läser in dyk...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>Molnlagrings fel: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Läser in dyk från lokal lagring ('molnfritt' läge)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Misslyckades ansluta till moln server, återgår till molnfri status</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Molnlagring öppnades framgångsrikt. Inga dyk i dyklistan</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>Okänd GPS position</translation> </message> @@ -6465,7 +6535,7 @@ Vänligen exportera mallen till en ny fil.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>Startar...</translation> </message> @@ -6557,116 +6627,126 @@ Vänligen exportera mallen till en ny fil.</translation> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Inställningar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>Odefinierad</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>Felaktigt användarnamn/lösenords kombination</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>Referenserna behöver verifieras</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>Referenser verifierade</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>Molnfritt läge</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>Molnstatus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Epost</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>Inte tillämpliga</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>Ändring</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Blå</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>vanlig text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>Markera</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>Mörk</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS data webbtjänst</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>Avståndsgräns (meter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>Tidsgräns (minuter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>Standardflaska</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>Flaska:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>Utvecklare</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>Visa utvecklarmeny</translation> </message> @@ -6701,16 +6781,14 @@ Vänligen exportera mallen till en ny fil.</translation> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>Varning! -Alla bilder har inte en tidstämpel mellan -30 minuter innan starten och 30 minuter efter slutet på något av de valda dyken.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>Ladda bilder även om tiderna inte matchar dyktiden</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6733,39 +6811,39 @@ Alla bilder har inte en tidstämpel mellan <translation>Vilket datum och tid visas på bilden?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>Bildfiler</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> Filer med felaktig datum/tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>Inget Exif datum/tid hittat</translation> </message> @@ -6858,28 +6936,28 @@ Filer med felaktig datum/tid</translation> <translation>Importera meddelanden (fel, varningar, etc)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>Öppna SmartTrak filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>Alla filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface filer</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>Öppna Subsurface filer</translation> </message> @@ -6887,64 +6965,64 @@ Filer med felaktig datum/tid</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Små</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dykdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varaktighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>Min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dykplats: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Parkamrat: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7081,65 +7159,17 @@ Filer med felaktig datum/tid</translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Mata in användarid och klicka på nerladdning</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webbtjänst</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Ansluter...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>Nedladdning klar</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>Nedladdningsfel: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Kontaktfel:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Ogiltigt användarid!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Kan inte tolka respons</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>Nedladdningen lyckades</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>Dräkter:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>Ingen dräkt vald</translation> </message> @@ -7270,39 +7300,44 @@ Filer med felaktig datum/tid</translation> <translation>Zoomnivå</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>Laddar bild(er) från fil(er)</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>Ladda bild(er) från nätet</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>Radera valda bilder</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>Radera alla bilder</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>Raderar bilder</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>Är du säker på att du vill radera alla bilder?</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7470,15 +7505,15 @@ mixas av luft och: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Taggar:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Taggar</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>Toma taggar</translation> </message> @@ -7677,7 +7712,7 @@ mixas av luft och: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>%1klicka för att besöka %2</translation> </message> @@ -7701,130 +7736,135 @@ mixas av luft och: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 visad)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>Ljup(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Flaska</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Taggar</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Parkamrat</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>Vikt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>Foton före/under/efter dyket</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Plats</translation> </message> @@ -7838,81 +7878,81 @@ mixas av luft och: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>Ange URL för bilder</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Sök efter uppdateringar</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kunde inte kolla efter uppdateringar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>Följande fel inträffade:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>Du använder dig av den senaste versionen av Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>En ny version av Subsurface finns tillgänglig.<br/>Klicka på:<br/><a href="%1">%1</a><br/> för att ladda ner den.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>En ny version av Subsurface finns tillgänglig.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Senaste versionen är %1, vänligen se %2 vår nerladningssida %3 för information om du uppdaterar.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>Senast släppta version är</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>Servern returnerade följande information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface kollar varannan vecka om det har kommit en ny version. Om du inte vill att Subsurface skall göra det, vänligen klicka på Avslå</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>Avslå</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Sök efter uppdateringar automatiskt</translation> </message> @@ -8087,6 +8127,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8142,12 +8195,12 @@ Language: %1</source> <translation>Ladda upp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>Begäran tog för lång tid</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>Överför data...</translation> </message> @@ -8173,8 +8226,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>Inget fel</translation> </message> @@ -8295,7 +8348,7 @@ Medel</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>Misslyckades läsa sidhuvudet</translation> </message> @@ -8631,9 +8684,9 @@ Medel</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8648,131 +8701,131 @@ Medel</translation> <translation>Öppet system</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>integrerat</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>bälte</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>Ryggplatta</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8849,123 +8902,123 @@ Medel</translation> <translation>Ingen dykprofil hittades för '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>Flytta från lagringsplats (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>Flytta till lagringsplats (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Lokal cache katalog %s är trasig - kan inte synkronisera med Subsurface molnlagring</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>Kunde inte uppdatera lokal cache med nyare extern data</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface molnlagring skadades</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Kunde inte uppdatera Subsurface molnlagring, försök igen senare</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Extern lagring och lokal data separerade. Fel: sammanfogning misslyckades (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Extern lagring och lokal data separerade. Kan inte kombinera lokala och externa ändringar</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>Extern lagring och lokal data separerade</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Extern lagring och lokal data separerade. Fel: skrivning av data misslyckades (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problem med lokal cache av Subsurface molndata</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Flyttade cache data till %s. Vänligen försök igen.</translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>Försöker sammanfoga lokala förändringar i molnlagringsmiljön</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>Spara till molnlagring</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>Synka med molnlagring</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>Klar med synkronisering till molnlagring</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Fel på uppkopplingen mot Subsurface molntjänst</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone av %s misslyckades (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>Synkroniserar datafil</translation> </message> @@ -9064,118 +9117,118 @@ Medel</translation> <translation>okänt händelsenummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Kunde inte tolka tid och datum</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>Dyk #%d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Kunde inte tolka dyktid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Kunde inte tolka maxdjup</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>Misslyckas läsa temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Kunde inte tolka antal gasblandningar</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Kunde inte ladda vattnets salthalt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Kunde inte få tag i tyck vid ytan</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>Misslyckades läsa dykläge</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Kunde inte tolka gasblandning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Kan inte skapa parser för %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Kunde inte registrera parser-data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>Dyket %s är redan nedladdat</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>modell=%s firmware=%u serenummerl=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9184,13 +9237,13 @@ I många fall, för att avhjälpa och analysera problemet, kan en loggfil från Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogfönstret.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>Inga nya dyk att ladda ner från dykdator</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multipla GPS positioner för denna dykplats; även %s @@ -9198,19 +9251,19 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>alternativt namn för platsen: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Dyk ladade från lokal buffert</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Lyckades med att öppna dykdata</translation> </message> @@ -9233,12 +9286,12 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Kunde inte läsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> @@ -9269,8 +9322,8 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>SP ändring</translation> </message> @@ -9532,17 +9585,17 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf <translation>lågt pO₂ värde %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9551,84 +9604,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Säkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9637,7 +9690,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9646,174 +9699,174 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>Densitet: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Säkerhetsstopp: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>I Deko </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>I deko (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (beräknad) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (beräknad) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>Beräknat tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vävnad %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>hjärtrytm: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>medeldjup fram tills hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9862,142 +9915,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>LUFT</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>mer än %1 dagar</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXYGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Kan inte öppna fil %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Lufttemp</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Vattentemperatur</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Dyk</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>Resor</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Statistik</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Avancerad sökning</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Synlighet</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Parkamrat</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Dräkt</translation> </message> @@ -10008,180 +10061,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Taggar</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Anteckningar</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>Visa mer deltaljer</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>År</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Total tid</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>Genomsnittlig tid</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>Kortaste tid</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>Längsta tid</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>Genomsnittligt djup</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>Minsta. ljup</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Maxdjup</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>Genomsnittlig SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>Minsta. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>Största. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>Genomsnittlig temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>Minsta temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>Största temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>Tillbaka till listan</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Dyk #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>Dykprofil</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>Dykinformation</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>Dykutrustning</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Storlek</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>Arbetstryck</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>Starttryck</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>Sluttryck</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>Händelser</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>Namn</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>Värde</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>Dykstatus</translation> </message> @@ -10211,62 +10264,62 @@ EADD: %d%s / %.1fg/ℓ <translation>Alla (baserat på resestatus)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>maj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>dec</translation> </message> @@ -10517,12 +10570,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sek</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Maximalt djup</translation> @@ -10548,77 +10606,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Anteckningar:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>Byggd</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>Sjönk</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>Nedstigningstid</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>Anledning</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>Nationalitet</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>Varv</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>Skeppstyp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>Längd</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>Bredd</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>Djupgånde</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>Deplacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>Last</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>Vrakinformation</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>Höjd</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Djup</translation> </message> @@ -10663,27 +10721,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Storstad</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>Börja spara data</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>Börja spara dyk</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>Färdig med att skapa en lokal buffert</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>Förbereder att spara data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10698,7 +10756,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ta bort denna punkt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>Spara inte en tom logbok i molnet</translation> </message> @@ -10718,22 +10776,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Ogiltigt svar från server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Förväntade XML tag 'DiveDateReader' men fick istället '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Förväntad XML tagg 'DiveDates' gick ej att finna</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>Felformaterat XML svar. Rad %1: %2</translation> </message> @@ -10746,112 +10804,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>Dyklista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>Dykhantering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>Aktivera automatisk molnsynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>Stängav positions tjänsten</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Inställningar</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>Lägg till dyk manuellt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>Ladda ner från dykdator</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>Manuellt synkronisera med molnet</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Deaktiverande av automatisk molnsynkronisering gör att all data lagras lokalt. Detta kan vara användbart i situationer med begränsad eller ingen nätverksåtkomst. Vänligen välg 'Manuell synkronisering med molnlagring' om du har uppkoppling och vill synkronisera ditt data till molnlagringen.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Hjälp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>Ladda upp GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>Sätt GPS position</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>Ladda ner GPS data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>Visa GPS position</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>Rensa GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>Utvecklare</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App logg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>Tema information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>Kör positions tjänst</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index a03d3a9fc..fd2eba262 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1658,100 +1658,100 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1967,22 +1967,22 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1990,103 +1990,135 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Tarih:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>Konum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>Süre:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>Hava Sıcaklığı:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>Su Sıcaklığı:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>Divemaster(Dalış lideri):</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>Değerlendirme:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>Notlar:</translation> </message> @@ -2255,104 +2287,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Hepsini aç</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Geziden dalış kaldır</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Dalış sil</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Seçili dalışları birleştir</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Dalışları yeniden numaralandır</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Görüntü dosyalarını aç</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2553,7 +2600,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation type="unfinished"/> </message> @@ -2563,121 +2610,121 @@ GPS location:</source> <translation>kum</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>Divelogs.de web sitesine dalış verilerini gönder.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface doğal XML biçimi</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>UDDF dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>CSV dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>Dünya haritasını dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Subsurface XML dışa aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>HTML dosyası olarak dışarı aktar</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>%s dosyası açılamıyor</translation> </message> @@ -3037,62 +3084,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>Final derinlik</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>Çalışma süresi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>Gaz kullanımı</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>dak</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3293,260 +3340,266 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>Azami MSS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>Etiketler</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>Fotoğraflar</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>Hiçbir dalış seçilmedi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>yükleme için zip dosyası oluşturma başarısız oldu: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>iç hata</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>Bitti</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>Dalış listesi yükleniyor ...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>Dalış listesi indiriliyor ...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>%1 dalış indiriliyor...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>İndirme bitti- %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>İndirme bozuk</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>Arşiv açılamadı: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>Yükleme bitti</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>Yükleme başarısız oldu</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>Yükleme başarılı</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>Giriş başarısız</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>Hata: %1</translation> </message> @@ -3554,23 +3607,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>İndir</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Hata</translation> </message> @@ -3580,42 +3633,47 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> @@ -3687,9 +3745,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>İndir</translation> </message> @@ -3715,7 +3773,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -3730,57 +3788,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Yeniden dene</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Uygula</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Tümünü Seç</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3811,12 +3875,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3824,22 +3888,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3855,17 +3919,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>Tümünü Seç</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3920,17 +3984,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3946,7 +4010,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3961,17 +4025,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4064,40 +4128,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>Konum:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Konum</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4105,7 +4169,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4229,8 +4293,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notlar</translation> </message> @@ -4251,19 +4315,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Hava sıcaklığı.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Su sıcaklığı.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Konum</translation> </message> @@ -4344,8 +4408,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>Fotoğraflar</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4378,53 +4442,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Hava sıcaklığı. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Su sıcaklığı. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>Bu gezi düzenleniyor.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Çoklu dalış düzenleniyor.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>Bu dalış düzenleniyor.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Gezi notları</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Gezi konumu</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Değişiklikleri silinsin mi ?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4457,424 +4521,419 @@ p, li { white-space: pre-wrap; } <translation>&İçe Aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>&Yeni seyir defteri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Yeni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>&Seyir defteri aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>&Kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>&Farklı kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Farklı kaydet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>&Kapat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Kapat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>&Yazdır</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>&Tercihler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>&Çıkış</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>&Dalış bilgisayarından içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>&Subsurface web hizmetinden GPS verilerini içe aktar</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>&Dalış ekle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>&Yeniden numarala</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>&Otomatik grup</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>&Yıllık istatistikler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>&Dalış listesi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>&Bilgi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>&Tümü</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>&Subsurface Hakkında</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>&Kullanıcı rehberi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>&Dalış planı</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>&Kayıt dosyalarını içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>Diğer uygulamalardan dalış kayıt dosyalarını içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>&divelogs.de'den içe aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>&Tam ekran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>Tam ekran geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>&Güncellemeler için denetle</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>&Dışa aktar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>pHe grafik değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>Hesaplanan tavanı değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>Tüm doku hesaplamalarını değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>Kalp atış hızı geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>MOD değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>EHD, END, EHYD değiştir</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>NDL, YZ geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>Cetvel geçişi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Dosya aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4888,212 +4947,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Dosyayı kapatmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bir dalış eklemeyi denemeden önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>Yıllık istatistikler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>%1 dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Veri dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>Değişiklikler kaydedilsin mi ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>Dalış kayıt dosyasını aç</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5149,7 +5208,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5157,39 +5216,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5327,7 +5386,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5352,6 +5411,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5382,29 +5442,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>Tüm ayarları temizle</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>Varsayılan değerler için tüm ayarları sıfırlayın</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>Varsayılan kayıt dosyasını aç</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5559,7 +5644,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5599,7 +5684,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Profil</translation> </message> @@ -5678,25 +5763,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Subsurface yeni bir dil yüklemek için yeniden başlatmanız gerekir.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5747,7 +5832,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5772,73 +5857,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface web hizmeti</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>Varsayılan kullanıcı kimliği</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>Yerel kullanıcı kimliği kaydedilsin mi ?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>Ağ</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6166,133 +6236,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>Gaz değişimi ekle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>Yerimi ekle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>OLay kaldır</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>Benzer olayları gizle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>İsmi düzenle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>Olayları gizle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>Seçili olayları kaldırılsın mı ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>Yeriminde ismi düzenle</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>Özel isim:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>İsim çok uzun!</translation> </message> @@ -6300,53 +6370,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6396,50 +6466,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>dak</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6447,7 +6517,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6539,116 +6609,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Ayarlar</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>Mavi</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6683,13 +6763,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6713,38 +6793,38 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>Görüntü dosyası aç</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6837,28 +6917,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6866,61 +6946,61 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Süre: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>dak</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dalış konumu: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7057,65 +7137,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>Kullanıcı kimliğini gir ve indir tıkla</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Webservisi</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Bağlanıyor...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>İndirme bitti</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>İndirme hatası: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>Bağlantı hatası: </translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Geçersiz kullanıcı tanımlayıcı!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Yanıt ayrıştırılamaz!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>İndirme başarılı</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7246,38 +7278,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7444,15 +7481,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>Etiketler:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>Etiketler</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7651,7 +7688,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7675,130 +7712,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>Etiketler</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>dak</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Konum</translation> </message> @@ -7812,80 +7854,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>Güncellemeler için denetle</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface güncellemeleri kontrol edemedi.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>Lütfen internet bağlantınızı kontrol edin.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Uygula</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>Güncellemeler için otomatik denetle</translation> </message> @@ -8061,6 +8103,19 @@ Lisan: %1</translation> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8116,12 +8171,12 @@ Lisan: %1</translation> <translation>Yükle</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>İşlem zaman aşımı</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8147,8 +8202,8 @@ Lisan: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8271,7 +8326,7 @@ Ortalama</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8607,9 +8662,9 @@ Ortalama</translation> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8624,131 +8679,131 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>paskal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/dak</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/san</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>fit/dak</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>fit/san</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>hava</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>entegre</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>kemer</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>ayak bileği</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>klipsli</translation> </message> @@ -8825,123 +8880,123 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9040,149 +9095,149 @@ Ortalama</translation> <translation>geçersiz olay numarası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Tarih saat ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Dalış zamanı ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Azami derinlik ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Gaz karışım sayısını ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Su tuzluluğu edinme hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>Yüzey basıncı edinme hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Gaz karışımı ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Veri kaydedilirken hata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Örnekleri ayrıştırma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>Olay: kullanıcı eylemi bekleniyor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Olay işleyicisi kayıt hatası.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Dalış verisi içe aktarma hatası</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9204,12 +9259,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -9240,8 +9295,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9503,260 +9558,260 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>%s gaz bulunamıyor</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>MSS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %udak @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>YZ: %udak </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>YZ: %udak (hesap) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> @@ -9805,142 +9860,142 @@ EADD: %d%s / %.1fg/ℓ <translation>B</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>HAVA</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>%s dosyası açılamıyor</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Zaman</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>Hava sıcaklığı.</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>Su sıcaklığı.</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Dalışlar</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Hepsini aç</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>Gelişmiş arama</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Görünütlük</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Divemaster(Dalış lideri)</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation type="unfinished"/> </message> @@ -9951,180 +10006,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>Etiketler</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Notlar</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>Yıllık istatistikler</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>Toplam süre</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>Azami derinlik</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>Dalış #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Tür</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Boyut</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>Koordinatlar</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10154,62 +10209,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Ocak</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Şubat</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Mart</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Nisan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Mayıs</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Haziran</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Temmuz</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Ağustos</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Eylül</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Ekim</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Kasım</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Aralık</translation> </message> @@ -10455,12 +10510,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10486,77 +10546,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Notlar:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>İrtifa</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Derinlik</translation> </message> @@ -10601,27 +10661,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10636,7 +10696,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Bu noktayı kaldır</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10656,22 +10716,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Azami</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>Sunucudan geçersiz yanıt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -10684,112 +10744,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Ayarlar</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index f8a87bed7..c7df75cd6 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -163,160 +163,160 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -324,12 +324,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -337,7 +337,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1658,100 +1658,100 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>Lỗi</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> @@ -1967,22 +1967,22 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>Xóa lần lặn</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation type="unfinished"/> </message> @@ -1990,103 +1990,135 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>Ngày tháng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>Độ sâu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>Cân nặng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2255,104 +2287,119 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>Tạo một chuyến đi mới phía trước</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>Gập chuyến đi với chuyến đi trước</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>Gộp chuyến đi với chuyến đi bên dưới</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>Đánh dấu (các)lần lặn không hợp lệ</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>Mở tập tin hình ảnh</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation type="unfinished"/> </message> </context> <context> @@ -2553,7 +2600,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Sáng</translation> </message> @@ -2563,121 +2610,121 @@ GPS location:</source> <translation>Cát</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> @@ -3037,62 +3084,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3293,259 +3340,265 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>Xilan</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>Bạn</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3553,23 +3606,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>Lỗi</translation> </message> @@ -3579,42 +3632,47 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> @@ -3686,9 +3744,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3714,7 +3772,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3729,57 +3787,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Thử lại</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>Thoát</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Chấp nhậ</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3810,12 +3874,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3823,22 +3887,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3854,17 +3918,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3919,17 +3983,17 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> @@ -3945,7 +4009,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> + <source>Traverse media directories</source> <translation type="unfinished"/> </message> <message> @@ -3960,17 +4024,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4063,40 +4127,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>Địa điểm</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation type="unfinished"/> </message> @@ -4104,7 +4168,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -4228,8 +4292,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -4250,19 +4314,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -4343,7 +4407,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> + <source>Media</source> <translation type="unfinished"/> </message> <message> @@ -4377,53 +4441,53 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4456,424 +4520,419 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>Mới</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>Lưu dưới dạng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>Đóng lại</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4887,212 +4946,212 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -5148,7 +5207,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5156,39 +5215,39 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation type="unfinished"/> </message> @@ -5326,7 +5385,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> + <source>&No default file</source> <translation type="unfinished"/> </message> <message> @@ -5351,6 +5410,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation type="unfinished"/> </message> @@ -5381,29 +5441,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5558,7 +5643,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> + <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> @@ -5598,7 +5683,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>Hồ sơ</translation> </message> @@ -5677,25 +5762,25 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation type="unfinished"/> @@ -5746,7 +5831,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5771,73 +5856,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6165,133 +6235,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6299,53 +6369,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> @@ -6395,50 +6465,50 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6446,7 +6516,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation type="unfinished"/> </message> @@ -6538,116 +6608,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>Thiết lập</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>Trạng thái</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>Giao diện</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6682,13 +6762,13 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> + <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> @@ -6712,38 +6792,38 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -6836,28 +6916,28 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation type="unfinished"/> </message> @@ -6865,59 +6945,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -7053,65 +7133,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>Dịch vụ web</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>Đang kết nối...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>Nhận dạng người dùng không hợp lệ!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>Không nhận được trả lời!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7242,38 +7274,43 @@ Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> + <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> + <source>Delete selected media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> <translation type="unfinished"/> </message> </context> @@ -7440,15 +7477,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> <translation type="unfinished"/> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7647,7 +7684,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7671,130 +7708,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>Xilan</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>CNS tối đa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>Bạn</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -7808,80 +7850,80 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> + <source>Enter URL for media files</source> <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>Chấp nhậ</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -8053,6 +8095,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8108,12 +8163,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -8139,8 +8194,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8254,7 +8309,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -8590,9 +8645,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8607,131 +8662,131 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>được tích hợp</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>dây ràng</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>mắt cá chân</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8808,123 +8863,123 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9023,149 +9078,149 @@ Maximum</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>Lỗi khi chuyển thông số thời gian</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>Lỗi khi chuyển thông số thời gian lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>Lỗi khi thu nhận độ mặn của nước</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>Không thể tạo việc chuyển thông số cho %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <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="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <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="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <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="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -9188,12 +9243,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -9224,8 +9279,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation type="unfinished"/> </message> @@ -9487,252 +9542,252 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> @@ -9781,142 +9836,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>Lần lặn</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>Thống kê</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>Tầm nhìn</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>Người lặn giỏi nhất</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>Bạn</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> @@ -9927,180 +9982,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>Năm</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>Kích thước</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation type="unfinished"/> </message> @@ -10130,62 +10185,62 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>Th12</translation> </message> @@ -10431,12 +10486,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> @@ -10462,77 +10522,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>Độ sâu</translation> </message> @@ -10577,27 +10637,27 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10612,7 +10672,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -10632,22 +10692,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Tối đa</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -10660,112 +10720,102 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>Thiết lập</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>Trợ giúp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index c1d682072..2a20eb07f 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -167,160 +167,160 @@ <translation>掃描遠端裝置...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> <source>Scanning finished successfully.</source> <translation>掃描完成</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>%1 是本地端藍芽裝置. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned on</source> <translation>開啟</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> <source>turned off</source> <translation>關閉</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> <source>UNPAIRED</source> <translation>未配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>PAIRED</source> <translation>配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>AUTHORIZED_PAIRED</source> <translation>合法配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [狀態: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>裝置 %1 可接受連線. 按下儲存按鈕繼續. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>裝置 %1 必須被配對後才能使用. 請於選單找尋配對選項. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> <source>A device needs a non-zero address for a connection.</source> <translation>裝置需要為非空白位置來進行連結. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> <source>The local device was changed.</source> <translation>本地端裝置被改變. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Pair</source> <translation>配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> <source>Remove pairing</source> <translation>移除配對</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> <source>Trying to pair device %1</source> <translation>嘗試配對裝置 %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> <source>Trying to unpair device %1</source> <translation>嘗試中止配對裝置 %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was unpaired.</source> <translation>裝置 %1 未配對. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> <source>Device %1 was paired.</source> <translation>裝置 %1 已配對. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>Device %1 was paired and is authorized.</source> <translation>裝置 %1 已配對且授權成功. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>裝置 %1 現在已可接受連線. 可按下儲存按鈕繼續. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Local device error: %1.</source> <translation>本地端裝置錯誤: %1. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>配對錯誤. 若是遠端裝置需要自定 PIN 碼, 請嘗試於您的作業系統先進行配對. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> <source>Unknown error</source> <translation>未知錯誤</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>藍芽配接器電源已被關閉, 請開啟電源以進行搜尋. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>寫入或讀出裝置造成錯誤. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> <source>An unknown error has occurred.</source> <translation>發生未知錯誤. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> <source>Device discovery error: %1.</source> <translation>裝置發生錯誤: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> <source>Not available</source> <translation>不可用</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>無法連接本地端藍芽配接器. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>因為位址 %1 無法符合本地端藍芽裝置的實體配接器位置, 裝置代理無法被建立. </translation> </message> @@ -328,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> - <source>Person: </source> - <translation>人名: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <source>Person</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Searches for buddies and divemasters</source> <translation>搜尋潛伴與潛導</translation> </message> @@ -341,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="279"/> + <location filename="../qt-models/filtermodels.cpp" line="374"/> <source>No buddies</source> <translation>無潛伴</translation> </message> @@ -1662,102 +1662,102 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/> <source>Backup dive computer settings</source> <translation>備份潛水電腦設定</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Backup files</source> <translation>備份檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/> <source>XML backup error</source> <translation>XML備份錯誤</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>An error occurred while saving the backup file. %1</source> <translation>儲存備份檔案時發生錯誤。 %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> <source>Backup succeeded</source> <translation>備份成功</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Your settings have been saved to: %1</source> <translation>設定會儲存至:%1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/> <source>Restore dive computer settings</source> <translation>還原潛水電腦設定</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/> <source>XML restore error</source> <translation>XML還原錯誤</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>An error occurred while restoring the backup file. %1</source> <translation>還原備份檔案時發生錯誤。 %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/> <source>Restore succeeded</source> <translation>還原成功</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Your settings have been restored successfully.</source> <translation>設定被還原成功.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/> <source>Select firmware file</source> <translation>選擇韌體檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>All files</source> <translation>全部檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/> <source>Log files</source> <translation>日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/> <source>Connecting to device...</source> <translation>正在與裝置連接...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/> <source>Connected to device</source> <translation>已連接裝置</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/> <source>Disconnected from device</source> <translation>與裝置連接中斷</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/> <source>Choose file for dive computer download logfile</source> <translation>選取潛水電腦下載日誌檔案</translation> </message> @@ -1973,22 +1973,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="47"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/> <source>Dive details</source> <translation>潛水細節</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="142"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/> <source>Delete dive</source> <translation>刪除此潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/> <source>Cancel edit</source> <translation>取消編輯</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/> <source>Show on map</source> <translation>顯示於地圖</translation> </message> @@ -1996,104 +1996,136 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="116"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Dive %1</source> <translation>Dive %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="120"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Date:</source> <translation>日期:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="132"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Location:</source> <translation>位置:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> <source>Coordinates:</source> <translation>座標:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> <source>Use current GPS location:</source> <translation>使用目前 GPS位置:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> <source>Depth:</source> <translation>深度:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> <source>Duration:</source> <translation>時間:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Air Temp:</source> <translation>氣溫:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> <source>Water Temp:</source> <translation>水溫:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> <source>Suit:</source> <translation>防寒衣:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Divemaster:</source> <translation>潛導:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> <source>Weight:</source> <translation>重量:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> - <source>Cylinder:</source> - <translation>氣瓶:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <source>Cylinder1:</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> <source>Gas mix:</source> <translation>氣體混合:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> <source>Start Pressure:</source> <translation>起始壓力:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> <source>End Pressure:</source> <translation>結束壓力:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <source>Cylinder2:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <source>Cylinder3:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <source>Cylinder4:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <source>Cylinder5:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> <source>Rating:</source> <translation>評分:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> <source>Visibility:</source> <translation>能見度:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> <source>Notes:</source> <translation>記錄:</translation> </message> @@ -2262,104 +2294,119 @@ GPS位置:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="848"/> <source>Expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="850"/> <source>Collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="854"/> <source>Collapse others</source> <translation>摺疊其它</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="865"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Remove dive(s) from trip</source> <translation>從旅程中移除潛水記錄(多支)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Create new trip above</source> <translation>設定為新的旅程</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="873"/> <source>Add dive(s) to trip immediately above</source> <translation>於上方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="875"/> <source>Add dive(s) to trip immediately below</source> <translation>於下方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip above</source> <translation>與上方旅程合併</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Merge trip with trip below</source> <translation>與下方旅程合併</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="884"/> <source>Delete dive(s)</source> <translation>刪除潛水記錄(多支)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Mark dive(s) invalid</source> <translation>標示為無效的潛水記錄(多支)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="890"/> <source>Merge selected dives</source> <translation>合併所選擇的潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="899"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Renumber dive(s)</source> <translation>為潛水記錄(多支)重新編號</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Shift dive times</source> <translation>移動潛水時間</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Split selected dives</source> <translation>分開所選擇的潛水</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image(s) from file(s)</source> <translation>從多檔案載入圖片</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Load image from web</source> <translation>從網頁載入影像</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="929"/> - <source>Image files (%1)</source> - <translation>影像檔案 (%1)</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <source>Open media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="985"/> - <source>%1 does not appear to be an image</source> - <translation>%1 非影像檔案</translation> + <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <source>Media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <source>Image files</source> + <translation>影像檔案</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="927"/> - <source>Open image files</source> - <translation>開啟影像檔</translation> + <source>Video files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <source>All files</source> + <translation>全部檔案</translation> + </message> + <message> + <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <source>%1 does not appear to be an image</source> + <translation>%1 非影像檔案</translation> </message> </context> <context> @@ -2560,7 +2607,7 @@ GPS位置:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Light</source> <translation>Light</translation> </message> @@ -2570,121 +2617,121 @@ GPS位置:</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>通用格式是於不同潛水程式中,做為資料交換使用。</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/> <source>Comma separated values describing the dive profile.</source> <translation>描述潛水摘要時,請以逗號分隔資料。</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>包含大部分潛水細節但不包含摘要部分,資料以逗號分隔。</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> <source>Send the dive data to divelogs.de website.</source> <translation>傳送潛水資料至 divelogs.de 網站。</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>傳送潛水資料至dive-share.appspot.com網站.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>匯出潛點位置至 HTML,並繪製於地圖上。</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Subsurface native XML format.</source> <translation>Subsurface 原生 XML 格式</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/> <source>Write depths of images to file.</source> <translation>寫入影像深度至檔案中</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/> <source>Write dive as TeX macros to file.</source> <translation>依照 TeX 巨集寫入潛水記錄至檔案. </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/> <source>Export UDDF file as</source> <translation>匯出 UDDF 檔案為</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="135"/> <source>UDDF files</source> <translation>UDDF檔案</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/> <source>HTML files</source> <translation>HTML檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Subsurface files</source> <translation>Subsurface檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>TeX files</source> <translation>TeX檔案</translation> </message> <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>匯出 CSV 檔案為</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>Export world map</source> <translation>匯出地圖</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> <source>Export Subsurface XML</source> <translation>匯出 Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> <source>Save image depths</source> <translation>儲存影像深度</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Export to TeX file</source> <translation>輸出 TeX 檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export HTML files as</source> <translation>匯出 HTML 檔案為</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="187"/> <source>Please wait, exporting...</source> <translation>請稍待, 匯出中...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="222"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="404"/> <source>Can't open file %s</source> <translation>無法開啟檔案 %s</translation> </message> @@ -3044,62 +3091,62 @@ GPS位置:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="169"/> + <location filename="../qt-models/diveplannermodel.cpp" line="170"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="270"/> + <location filename="../qt-models/diveplannermodel.cpp" line="271"/> <source>cyl.</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Final depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Run time</source> <translation>持續時間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="380"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="382"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>Used gas</source> <translation>使用氣量</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="384"/> + <location filename="../qt-models/diveplannermodel.cpp" line="385"/> <source>CC setpoint</source> <translation>CC 設定點</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="386"/> + <location filename="../qt-models/diveplannermodel.cpp" line="387"/> <source>Dive mode</source> <translation>潛水模式</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1038"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1044"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1047"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1094"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> <source>Stop times</source> <translation>停留次數</translation> </message> @@ -3304,261 +3351,267 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="482"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="485"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>Temp.</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Cylinder</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Gas</source> <translation>氣體</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="569"/> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="572"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="584"/> <source>Max CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> - <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="587"/> <source>Tags</source> <translation>標籤</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <source>Photos</source> - <translation>照片</translation> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <source>Media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Country</source> <translation>國家</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <source>Buddy</source> + <translation>潛伴</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="596"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Depth(%1)</source> <translation>深度(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Temp.(%1%2)</source> <translation>溫度 (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>Weight(%1)</source> <translation>重量(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="566"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> - <source>Photos before/during/after dive</source> - <translation>潛水前/中/後的照片</translation> + <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> </message> </context> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="157"/> <source>no dives were selected</source> <translation>未選取任何潛水</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>輸出至 divelogs.de 的表格格式不存在</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>failed to create zip file for upload: %s</source> <translation>建立 zip 壓縮檔上傳失敗: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> <source>internal error</source> <translation>內部錯誤</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>轉換潛水 %1 至 divelogs.de 格式錯誤</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>寫入 ZIP 檔案: %s 發生錯誤 %d 系統錯誤 %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> <source>Done</source> <translation>完成</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> <source>Uploading dive list...</source> <translation>上傳潛水列表...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> <source>Downloading dive list...</source> <translation>下載潛水列表...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> <source>Downloading %1 dives...</source> <translation>下載 %1 潛水...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> <source>Download finished - %1</source> <translation>下載結束 - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Problem with download</source> <translation>下載發生錯誤</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> <source>The archive could not be opened: </source> <translation>存檔無法被開啟: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Corrupted download</source> <translation>中斷下載</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> <source>The archive could not be opened: %1</source> <translation>此存檔無法被開啟: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="714"/> <source>Upload finished</source> <translation>上傳結束</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload failed</source> <translation>上傳失敗</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Upload successful</source> <translation>上傳成功</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Login failed</source> <translation>登入失敗</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> <source>Cannot parse response</source> <translation>回覆無法解析</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> <source>Error: %1</source> <translation>錯誤: %1</translation> </message> @@ -3566,23 +3619,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> <source>Download</source> <translation>下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> <source>Choose Bluetooth download mode</source> <translation>選擇藍芽下載模式</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> <source>Connecting to dive computer</source> <translation>與潛水電腦連結</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> <source>Error</source> <translation>錯誤</translation> </message> @@ -3592,42 +3645,47 @@ p, li { white-space: pre-wrap; } <translation>搜索Uemis潛水設備</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="278"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <source>Find Garmin dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> <source>Cancel download</source> <translation>取消下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="361"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> <source>Choose file for dive computer download logfile</source> <translation>選取潛水電腦下載日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> <source>Log files</source> <translation>日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="387"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> <source>Choose file for dive computer binary dump file</source> <translation>選取潛水電腦二進制資料檔</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> <source>Dump files</source> <translation>傾印檔案</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> <source>Retry download</source> <translation>重試下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Warning</source> <translation>提醒</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation> </message> @@ -3699,9 +3757,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="178"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="196"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="259"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>下載</translation> </message> @@ -3727,7 +3785,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -3742,57 +3800,63 @@ p, li { white-space: pre-wrap; } <translation>藍芽未被啟用</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> <source> Vendor name: </source> <translation>廠商名稱: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="86"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <source>USB device</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> <source> Dive Computer:</source> <translation>潛水電腦:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> <source> Connection:</source> <translation>連線:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="180"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>重試</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="191"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> <source>Quit</source> <translation>結束</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source>Rescan</source> <translation>重新掃描</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="213"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> <source> Downloaded dives</source> <translation>下載潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> <source>Info:</source> <translation>資訊:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="251"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>同意</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>選擇全部</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>取消選取</translation> </message> @@ -3823,12 +3887,12 @@ p, li { white-space: pre-wrap; } <translation>連結至Facebook張貼</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>從Facebook帳號中斷Subsurface連接, 改以使用選單"分享"進入. </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>請先登入連結 Facebook 帳號。來啟動 Subsurface 發布潛水記錄至您的時間表</translation> </message> @@ -3836,22 +3900,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Facebook logged in successfully</source> <translation>Facebook登入成功</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/> <source>Error, unknown user id, cannot login.</source> <translation>錯誤, 未知使用者 ID, 無法登入</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/> <source>Dive uploaded successfully to Facebook</source> <translation>日誌上傳至Facebook成功</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>上傳潛水失敗. 請確認除錯輸出並傳送至 Subsurface 郵件名單</translation> </message> @@ -3867,17 +3931,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Select All</source> <translation>選擇全部</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Unselect All</source> <translation>取消選取</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Invert Selection</source> <translation>將選擇反轉</translation> </message> @@ -3932,58 +3996,58 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> - <source>Find moved images</source> + <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> - <source>Found images</source> + <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> - <source>Match only images in selected dive(s)</source> + <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> <source>Scanning:</source> - <translation type="unfinished"/> + <translation>掃描:</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> <source>Select folder and scan</source> - <translation type="unfinished"/> + <translation>選擇資料夾並掃描</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/> - <source>Traverse image directories</source> - <translation>經過照片路徑</translation> + <source>Traverse media directories</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/> <source>Stop scanning</source> - <translation type="unfinished"/> + <translation>停止掃描</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/> <source>Scanning cancelled - results may be incomplete</source> - <translation type="unfinished"/> + <translation>掃描取消 - 可能結果不完整</translation> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/> - <source>No matching images found</source> + <source>No matching media files found</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/> - <source>Found <b>%1</b> images at their current place.</source> + <source>Found <b>%1</b> media files at their current place.</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/> - <source>Found <b>%1</b> images at new locations:</source> + <source>Found <b>%1</b> media files at new locations:</source> <translation type="unfinished"/> </message> </context> @@ -4076,40 +4140,40 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> - <source>Location: </source> - <translation>位置:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <source>Location</source> + <translation>位置</translation> </message> </context> <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> <source> (same GPS fix)</source> <translation> (同一 GPS 位置)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source> (~%1 away</source> <translation> (~%1 離開</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dive(s) 此處)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(無存在的 GPS 資料, 從此次潛水增加 GPS 位置)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>(no GPS data)</source> <translation>(無 GPS 資料)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <source>Pick site: </source> <translation>選擇潛點: </translation> </message> @@ -4117,7 +4181,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="327"/> + <location filename="../qt-models/filtermodels.cpp" line="420"/> <source>No location set</source> <translation>無位置組合</translation> </message> @@ -4242,8 +4306,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>記錄</translation> </message> @@ -4264,19 +4328,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>氣溫</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>水溫</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>位置</translation> </message> @@ -4357,8 +4421,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> - <source>Photos</source> - <translation>照片</translation> + <source>Media</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> @@ -4391,53 +4455,53 @@ p, li { white-space: pre-wrap; } <translation>新增配重系統</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>氣溫 [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>水溫 [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>此旅程已被編輯.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>此些旅程已被編輯.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>此潛水已被編輯.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>旅程筆記</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>旅程位置</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>新的潛點</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>取消變更?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>您將要放棄您的變更。</translation> </message> @@ -4470,424 +4534,419 @@ p, li { white-space: pre-wrap; } <translation>匯入</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="133"/> + <location filename="../desktop-widgets/mainwindow.ui" line="132"/> <source>&Edit</source> <translation>編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="137"/> <source>Share on</source> <translation>分享到</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="151"/> <source>&New logbook</source> <translation>建立新日誌</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="155"/> + <location filename="../desktop-widgets/mainwindow.ui" line="154"/> <source>New</source> <translation>建立</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> + <location filename="../desktop-widgets/mainwindow.ui" line="162"/> <source>&Open logbook</source> <translation>開啟日誌</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.ui" line="165"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>開啟</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="173"/> <source>&Save</source> <translation>儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="177"/> + <location filename="../desktop-widgets/mainwindow.ui" line="176"/> <source>Save</source> <translation>儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="184"/> <source>Sa&ve as</source> <translation>另存為</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="188"/> + <location filename="../desktop-widgets/mainwindow.ui" line="187"/> <source>Save as</source> <translation>另存為</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="195"/> <source>&Close</source> <translation>關閉</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="199"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <source>Close</source> <translation>關閉</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> + <location filename="../desktop-widgets/mainwindow.ui" line="206"/> <source>&Print</source> <translation>列印</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> + <location filename="../desktop-widgets/mainwindow.ui" line="214"/> <source>P&references</source> <translation>設置</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="226"/> + <location filename="../desktop-widgets/mainwindow.ui" line="225"/> <source>&Quit</source> <translation>結束</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <source>Import from &dive computer</source> <translation>從潛水電腦匯入</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Import &GPS data from Subsurface web service</source> - <translation>自 Subsurface 網路服務匯入 GPS 資料</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <source>Edit device &names</source> <translation>編輯裝置名稱</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="249"/> <source>&Add dive</source> <translation>新增潛水</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="257"/> <source>&Edit dive</source> <translation>編輯潛水</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="262"/> <source>&Copy dive components</source> <translation>拷貝潛水配件</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> + <location filename="../desktop-widgets/mainwindow.ui" line="270"/> <source>&Paste dive components</source> <translation>貼上潛水配件</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> + <location filename="../desktop-widgets/mainwindow.ui" line="278"/> <source>&Renumber</source> <translation>重新編號</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="289"/> <source>Auto &group</source> <translation>自動群組</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="294"/> <source>&Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> + <location filename="../desktop-widgets/mainwindow.ui" line="302"/> <source>&Dive list</source> <translation>潛水列表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> + <location filename="../desktop-widgets/mainwindow.ui" line="310"/> <source>&Profile</source> <translation>描述</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> + <location filename="../desktop-widgets/mainwindow.ui" line="318"/> <source>&Info</source> <translation>資訊</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> + <location filename="../desktop-widgets/mainwindow.ui" line="326"/> <source>&All</source> <translation>全部</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> + <location filename="../desktop-widgets/mainwindow.ui" line="334"/> <source>P&revious DC</source> <translation>上一個 DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> + <location filename="../desktop-widgets/mainwindow.ui" line="342"/> <source>&Next DC</source> <translation>下一個 DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> + <location filename="../desktop-widgets/mainwindow.ui" line="350"/> <source>&About Subsurface</source> <translation>關於 Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="367"/> + <location filename="../desktop-widgets/mainwindow.ui" line="358"/> <source>User &manual</source> <translation>使用者說明</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> + <location filename="../desktop-widgets/mainwindow.ui" line="366"/> <source>&Map</source> <translation>地圖</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> + <location filename="../desktop-widgets/mainwindow.ui" line="374"/> <source>P&lan dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> + <location filename="../desktop-widgets/mainwindow.ui" line="382"/> <source>&Import log files</source> <translation>匯入日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="394"/> + <location filename="../desktop-widgets/mainwindow.ui" line="385"/> <source>Import divelog files from other applications</source> <translation>從其他程序導入潛水檔案文件</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> + <location filename="../desktop-widgets/mainwindow.ui" line="393"/> <source>Import &from divelogs.de</source> <translation>自 Divelogs.de 匯入</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="410"/> + <location filename="../desktop-widgets/mainwindow.ui" line="401"/> <source>&Full screen</source> <translation>全螢幕</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="413"/> + <location filename="../desktop-widgets/mainwindow.ui" line="404"/> <source>Toggle full screen</source> <translation>切換為全螢幕</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> + <location filename="../desktop-widgets/mainwindow.ui" line="412"/> <source>&Check for updates</source> <translation>檢查有無更新</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="426"/> + <location filename="../desktop-widgets/mainwindow.ui" line="417"/> <source>&Export</source> <translation>匯出</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="429"/> + <location filename="../desktop-widgets/mainwindow.ui" line="420"/> <source>Export dive logs</source> <translation>匯出潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="437"/> + <location filename="../desktop-widgets/mainwindow.ui" line="428"/> <source>Configure &dive computer</source> <translation>潛水電腦設定</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="448"/> + <location filename="../desktop-widgets/mainwindow.ui" line="439"/> <source>Edit &dive in planner</source> <translation>編輯潛水計畫</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="460"/> + <location filename="../desktop-widgets/mainwindow.ui" line="451"/> <source>Toggle pO₂ graph</source> <translation>切換pO₂圖表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="472"/> + <location filename="../desktop-widgets/mainwindow.ui" line="463"/> <source>Toggle pN₂ graph</source> <translation>切換pN₂圖表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="484"/> + <location filename="../desktop-widgets/mainwindow.ui" line="475"/> <source>Toggle pHe graph</source> <translation>切換 pHe 圖表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="496"/> + <location filename="../desktop-widgets/mainwindow.ui" line="487"/> <source>Toggle DC reported ceiling</source> <translation>切換 DC 回報的上限深度</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="508"/> + <location filename="../desktop-widgets/mainwindow.ui" line="499"/> <source>Toggle calculated ceiling</source> <translation>切換計算的上限深度</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="520"/> + <location filename="../desktop-widgets/mainwindow.ui" line="511"/> <source>Toggle calculating all tissues</source> <translation>切換計算所有的組織</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="532"/> + <location filename="../desktop-widgets/mainwindow.ui" line="523"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>切換以每次增加 3m 計算的上限深度</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="544"/> + <location filename="../desktop-widgets/mainwindow.ui" line="535"/> <source>Toggle heart rate</source> <translation>切換心跳率</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="556"/> + <location filename="../desktop-widgets/mainwindow.ui" line="547"/> <source>Toggle MOD</source> <translation>切換 MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="568"/> + <location filename="../desktop-widgets/mainwindow.ui" line="559"/> <source>Toggle EAD, END, EADD</source> <translation>切換 EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="580"/> + <location filename="../desktop-widgets/mainwindow.ui" line="571"/> <source>Toggle NDL, TTS</source> <translation>切換 NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="592"/> + <location filename="../desktop-widgets/mainwindow.ui" line="583"/> <source>Toggle SAC rate</source> <translation>切換 SAC 率</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="604"/> + <location filename="../desktop-widgets/mainwindow.ui" line="595"/> <source>Toggle ruler</source> <translation>切換規則</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="616"/> + <location filename="../desktop-widgets/mainwindow.ui" line="607"/> <source>Scale graph</source> <translation>調整圖表比例</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="628"/> - <source>Toggle pictures</source> - <translation>切換圖片</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="619"/> + <source>Toggle media</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <location filename="../desktop-widgets/mainwindow.ui" line="680"/> + <source>&Find moved media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.ui" line="631"/> <source>Toggle gas bar</source> <translation>切換氣體壓力</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../desktop-widgets/mainwindow.ui" line="639"/> <source>&Filter divelist</source> <translation>過濾潛水列表</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="663"/> + <location filename="../desktop-widgets/mainwindow.ui" line="654"/> <source>Toggle tissue heat-map</source> <translation>切換組織熱度圖</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="668"/> + <location filename="../desktop-widgets/mainwindow.ui" line="659"/> <source>User &survey</source> <translation>使用者自訂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.ui" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> <source>&Undo</source> <translation>復原</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> <source>&Redo</source> <translation>取消還原</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="689"/> - <source>&Find moved images</source> - <translation>搜尋移動的照片</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../desktop-widgets/mainwindow.ui" line="685"/> <source>Open c&loud storage</source> <translation>開啟雲端裝置</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../desktop-widgets/mainwindow.ui" line="690"/> <source>Save to clo&ud storage</source> <translation>儲存至雲端裝置</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="704"/> + <location filename="../desktop-widgets/mainwindow.ui" line="695"/> <source>&Manage dive sites</source> <translation>管理潛點</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> + <location filename="../desktop-widgets/mainwindow.ui" line="700"/> <source>Dive Site &Edit</source> <translation>潛點編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="705"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <location filename="../desktop-widgets/mainwindow.ui" line="713"/> <source>Cloud storage online</source> <translation>線上雲端儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="376"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="414"/> <source>Connect to</source> <translation>連結至</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Disconnect from</source> <translation>從中斷</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="613"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1620"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>在開啟新檔前,請儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="578"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="583"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="594"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Warning</source> <translation>提醒</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/divelistview.cpp" line="595"/> <source>Trying to merge dives with %1min interval in between</source> <translation>以 %1 min 時間區間嘗試合併潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> <source>Template backup created</source> <translation>儲存備份範本</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="271"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="272"/> <source>The following backup printing templates were created: %1 @@ -4909,214 +4968,214 @@ can overwrite them on startup.</source> 且是自程式啟動覆蓋設定後, 無法直接編輯.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>前往線上版之前請先儲存或取消目前的日誌修改</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>有未儲存的變更. 想要上傳至雲端空間嗎? 如果選擇否, 雲端只會在下一次點選"開啟雲端空間", 或"儲存至雲端空間"選項時, 才會進行同步.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="700"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>取得線上雲端儲存失敗</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>在關閉檔案前,請儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="869"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>在新增潛水前,請先儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="942"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="929"/> <source>Print runtime table</source> <translation>列印操作表格</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="987"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1877"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1124"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1111"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>Dive log files</source> <translation>潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1649"/> <source>Subsurface files</source> <translation>Subsurface檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1413"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1417"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1431"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1418"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1432"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1433"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1434"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1421"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1435"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> <source>MkVI files</source> <translation>MkVI檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1436"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1423"/> <source>APD log viewer</source> <translation>APD日誌瀏覽器</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>OSTCtools</source> <translation>OSTC工具</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1438"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1439"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1426"/> <source>All files</source> <translation>全部檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1437"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>您是否要對資料檔案所做的修改進行儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1458"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>Save changes?</source> <translation>儲存變更? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1459"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存,所做變更將會遺失。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1648"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1736"/> <source>[local cache for] %1</source> <translation>[本地端暫存] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1751"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1738"/> <source>[cloud storage for] %1</source> <translation>[雲端裝置] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Opening datafile from older version</source> <translation>從較舊的版本中開啟資料檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1844"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1855"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2029"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/> <source>Contacting cloud service...</source> <translation>聯絡雲端服務...</translation> </message> @@ -5173,7 +5232,7 @@ QML 組件 QtPositioning 和 QtLocation 可能遺失!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> <source>Filter shows %1 (of %2) dives</source> <translation>過濾器顯示 %1 (of %2) 潛水</translation> </message> @@ -5181,12 +5240,12 @@ QML 組件 QtPositioning 和 QtLocation 可能遺失!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>請更新您的潛水電腦韌體:目前的版本 %1,最新的版本是 %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5195,27 +5254,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa 如果裝置是使用藍芽連接, 在繼續此更新前, 請使用與日誌下載相同的步驟</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source>Not now</source> <translation>非現在</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Update firmware</source> <translation>更新韌體</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> <source>Firmware upgrade notice</source> <translation>韌體升級注意</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/> <source>Save the downloaded firmware as</source> <translation>另存下載的韌體至</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Firmware files</source> <translation>韌體檔案</translation> </message> @@ -5353,8 +5412,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> - <source>No default file</source> - <translation>無預設檔案</translation> + <source>&No default file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> @@ -5378,6 +5437,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> <source>...</source> <translation>...</translation> </message> @@ -5408,29 +5468,54 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <source>Video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <source>ffmpeg executable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <source>Extract at position</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <source>Extract video thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> <source>Clear all settings</source> <translation>清除所有設定</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> <source>Reset all settings to their default value</source> <translation>使用預設值重置所有設定</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Open default log file</source> <translation>開啟預設的日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> <source>Subsurface files</source> <translation>Subsurface檔案</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <source>Select ffmpeg executable</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesGeoreference</name> @@ -5585,8 +5670,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> - <source>Recalculate thumbnails if older than image</source> - <translation>當縮圖太舊時重新產生</translation> + <source>Recalculate thumbnails if older than media file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> @@ -5625,7 +5710,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>於資料中顯示平均深度</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> + <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/> <source>Profile</source> <translation>資訊</translation> </message> @@ -5704,27 +5789,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/> <source>These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>會採用原始設定. 這可能與期望不符合. . 請查閱 http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/> <source>Literal characters</source> <translation>文字字母</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/> <source>Non-special character(s) in time format. </source> <translation>時間格式內無特殊字元(s). </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/> <source>Non-special character(s) in date format. </source> <translation>日期格式內無特殊字元(s). @@ -5776,7 +5861,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface 雲端裝置</translation> </message> @@ -5801,73 +5886,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>於本地端儲存密碼? </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> - <source>Subsurface web service</source> - <translation>Subsurface 網路服務</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> - <source>Default user ID</source> - <translation>預設的使用者 ID</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> - <source>Save user ID locally?</source> - <translation>是否儲存使用者 ID 於本機?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> <source>Network</source> <translation>網路</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>No proxy</source> <translation>無 proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>System proxy</source> <translation>系統 proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>忽略變更. 雲端空間帳號的 email 與密碼, 只能以字母, 數字, 和 '.', '-', '_', '+' 組成.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>忽略變更. 雲端空間帳號的 email 與新密碼, 只能以字母, 數字, 和 '.', '-', '_', '+' 組成.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 '.', '-', '_', 和 '+'. </translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface 雲端裝置 (證件認證)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface 雲端空間 (密碼錯誤)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface 雲端空間 (需要密碼)</translation> </message> @@ -6196,133 +6266,133 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="799"/> + <location filename="../profile-widget/profilewidget2.cpp" line="804"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="795"/> + <location filename="../profile-widget/profilewidget2.cpp" line="800"/> <source>Unknown dive computer</source> <translation>未知的潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="823"/> + <location filename="../profile-widget/profilewidget2.cpp" line="828"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>當超過處理時間,顯示關閉 NDL / TTS</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> <source>Add gas change</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Make first dive computer</source> <translation>設定優先潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="791"/> + <location filename="../profile-widget/profilewidget2.cpp" line="796"/> <source>Planned dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="793"/> + <location filename="../profile-widget/profilewidget2.cpp" line="798"/> <source>Manually added dive</source> <translation>手動新增潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Delete this dive computer</source> <translation>刪除此潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1428"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Add setpoint change</source> <translation>增加設置點變更</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> <source>Add bookmark</source> <translation>新增書籤</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Split dive into two</source> - <translation type="unfinished"/> + <translation>將此潛水分割為二</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> <source>Change divemode</source> <translation>變更潛水模式</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Edit the profile</source> <translation>編輯摘要</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> <source>Remove event</source> <translation>移除事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> <source>Hide similar events</source> <translation>隱藏相似事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1482"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Edit name</source> <translation>潛水名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1513"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>調整氣瓶壓力 %1 (目前添加為 %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1535"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Unhide all events</source> <translation>取消隱藏所有事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide events</source> <translation>隱藏事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> <source>Hide all %1 events?</source> <translation>隱藏所有 %1 事件?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1605"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Remove the selected event?</source> <translation>移除所選擇的事件?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1606"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1757"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> <source>Edit name of bookmark</source> <translation>編輯書籤名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1758"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> <source>Custom name:</source> <translation>自訂名稱:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1763"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> <source>Name is too long!</source> <translation>名稱太長!</translation> </message> @@ -6330,53 +6400,53 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> <source>Starting...</source> <translation>開始...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="253"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> <source>Open local dive data file</source> <translation>開啟本機端潛水資料檔</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="261"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> <source>Opening local data file failed</source> <translation>開啟本機端檔案失敗</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 潛水記錄載入自本機端潛水資料檔案</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="390"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> <source>working in no-cloud mode</source> <translation>於非雲端模式工作</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> <source>Error parsing local storage, giving up</source> <translation>本機端解析錯誤, 中斷</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>no cloud credentials</source> <translation>無雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="489"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Please enter valid cloud credentials.</source> <translation>請輸入合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 '.', '-', '_', 和 '+'. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="451"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>Invalid format for email address</source> <translation>錯誤的email格式</translation> </message> @@ -6426,50 +6496,50 @@ Please export this template to a different file.</source> <translation>無法連結雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="626"/> <source>Cloud credentials valid, loading dives...</source> <translation>雲端認證成功, 載入日誌</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="655"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Cloud storage error: %1</source> <translation>雲端儲存錯誤: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="682"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>從本機端載入日誌 (本機模式)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="772"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="753"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="950"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="931"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="932"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="949"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="930"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1359"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1358"/> <source>Unknown GPS location</source> <translation>未知的GPS位置</translation> </message> @@ -6477,7 +6547,7 @@ Please export this template to a different file.</source> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="178"/> <source>Starting...</source> <translation>開始...</translation> </message> @@ -6569,116 +6639,126 @@ Please export this template to a different file.</source> <context> <name>Settings</name> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Settings</source> <translation>設定</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>Undefined</source> <translation>未定義</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> <source>Incorrect username/password combination</source> <translation>不正確的帳號/密碼組合</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="22"/> <source>Credentials need to be verified</source> <translation>需要檢查憑證</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="23"/> <source>Credentials verified</source> <translation>憑證已確認</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="21"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="24"/> <source>No cloud mode</source> <translation>無雲端模式</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="31"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> <source>Cloud status</source> <translation>雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="39"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="42"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="45"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> <source>Not applicable</source> <translation>不適合</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> <source>Change</source> <translation>變更</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> <source>Status</source> <translation>狀態</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> <source>Theme</source> <translation>主題</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> <source>Blue</source> <translation>藍色</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="216"/> <source>regular text</source> <translation>regular text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="178"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="231"/> <source>Highlight</source> <translation>標示</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="149"/> <source>Pink</source> <translation>粉紅</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="201"/> <source>Dark</source> <translation>陰暗</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="265"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS 資料網站服務</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="274"/> <source>Distance threshold (meters)</source> <translation>距離門檻值 (meters)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="290"/> <source>Time threshold (minutes)</source> <translation>時間門檻值 (minutes)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="318"/> + <source>Default Cylinder</source> + <translation>預設氣瓶</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="327"/> + <source>Cylinder:</source> + <translation>氣瓶:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="352"/> <source>Developer</source> <translation>開發人員</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Display Developer menu</source> <translation>顯示開發者選單</translation> </message> @@ -6713,16 +6793,14 @@ Please export this template to a different file.</source> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> <source>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation>警示! -在這區間並非所有影像都帶有時間戳記 -選擇的潛水, 開始的 30 分鐘前與結束的 30 分鐘後. </translation> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> - <source>Load images even if the time does not match the dive time</source> - <translation>即使時間並不符合潛水時間, 也載入影像</translation> + <source>Load media files even if the time does not match the dive time</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> @@ -6745,39 +6823,39 @@ Not all images have timestamps in the range between <translation>哪個日期和時間將會被顯示在圖片上?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> <source>Open image file</source> <translation>開啟影像檔</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> <source>Image files</source> <translation>影像檔案</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> <source>Selected dive date/time</source> <translation>潛水日期/時間選擇</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> <source>First selected dive date/time</source> <translation>最初選擇的潛水日期/時間</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Last selected dive date/time</source> <translation>上次選擇的潛水日期/時間</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source> Files with inappropriate date/time</source> <translation> 檔案日期/時間不正確</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> <source>No Exif date/time found</source> <translation>無 Exif 日期/時間</translation> </message> @@ -6870,28 +6948,28 @@ Files with inappropriate date/time</source> <translation>重要訊息 (錯誤, 警告, 其它)</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="59"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/> <source>Open SmartTrak files</source> <translation>開啟 SmartTrak 檔案</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> <source>SmartTrak files</source> <translation>SmartTrak檔案</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="60"/> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>All files</source> <translation>全部檔案</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="71"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/> <source>Subsurface files</source> <translation>Subsurface檔案</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="70"/> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/> <source>Open Subsurface files</source> <translation>打開 Subsurface 檔案</translation> </message> @@ -6899,64 +6977,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>小</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>中</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>潛水日期: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>時間: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>潛水地點: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>潛伴: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>潛導: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7093,65 +7171,17 @@ Files with inappropriate date/time</source> </message> </context> <context> - <name>SubsurfaceWebServices</name> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> - <source>Enter User ID and click Download</source> - <translation>輸入使用者 ID 並點選下載</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> - <source>Webservice</source> - <translation>網頁服務</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> - <source>Connecting...</source> - <translation>連結...</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <source>Download finished</source> - <translation>下載結束</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> - <source>Download error: %1</source> - <translation>下載失敗: %1</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> - <source>Connection error: </source> - <translation>連結錯誤:</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> - <source>Invalid user identifier!</source> - <translation>錯誤的使用者 Id !</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> - <source>Cannot parse response!</source> - <translation>回覆無法解析!</translation> - </message> - <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> - <source>Download successful</source> - <translation>下載成功</translation> - </message> -</context> -<context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> - <source>Suits: </source> - <translation>潛水衣: </translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <source>Suits</source> + <translation type="unfinished"/> </message> </context> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="170"/> + <location filename="../qt-models/filtermodels.cpp" line="272"/> <source>No suit set</source> <translation>無套裝組合</translation> </message> @@ -7282,39 +7312,44 @@ Files with inappropriate date/time</source> <translation>縮放等級</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> - <source>Load image(s) from file(s)</source> - <translation>從多檔案載入圖片</translation> - </message> - <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> - <source>Load image(s) from web</source> - <translation>從網路載入圖片</translation> + <source>Load media from file(s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> - <source>Delete selected images</source> - <translation>刪除選取的影像</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <source>Load media file(s) from web</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> - <source>Delete all images</source> - <translation>刪除全部影像</translation> + <source>Delete selected media files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Delete all media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/> + <source>Open folder of selected media files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/> <source>Recalculate selected thumbnails</source> <translation>重新產生選擇的縮圖</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Deleting Images</source> - <translation>刪除影像</translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Deleting media files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> - <source>Are you sure you want to delete all images?</source> - <translation>你確定要刪除所有的影像? </translation> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/> + <source>Are you sure you want to delete all media files?</source> + <translation type="unfinished"/> </message> </context> <context> @@ -7482,15 +7517,15 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> - <source>Tags: </source> - <translation>標籤:</translation> + <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <source>Tags</source> + <translation>標籤</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="195"/> + <location filename="../qt-models/filtermodels.cpp" line="296"/> <source>Empty tags</source> <translation>空標籤</translation> </message> @@ -7689,7 +7724,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> <source>%1click to visit %2</source> <translation>按下 %1 前往 %2</translation> </message> @@ -7713,130 +7748,135 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="73"/> + <location filename="../qt-models/divetripmodel.cpp" line="74"/> <source>(%1 shown)</source> <translation>(%1 顯示)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="241"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Depth(%1)</source> <translation>深度(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Temp.(%1%2)</source> <translation>溫度 (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> + <location filename="../qt-models/divetripmodel.cpp" line="271"/> <source>Cylinder</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="273"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Max. CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <location filename="../qt-models/divetripmodel.cpp" line="288"/> <source>Tags</source> <translation>標籤</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="291"/> + <source>Media before/during/after dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="297"/> + <source>Buddy</source> + <translation>潛伴</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="375"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> <source>Weight(%1)</source> <translation>重量(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="265"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="268"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> + <location filename="../qt-models/divetripmodel.cpp" line="274"/> <source>Gas</source> <translation>氣體</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="267"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="270"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>Photos before/during/after dive</source> - <translation>潛水前/中/後的照片</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> + <location filename="../qt-models/divetripmodel.cpp" line="294"/> <source>Country</source> <translation>國家</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> + <location filename="../qt-models/divetripmodel.cpp" line="300"/> <source>Location</source> <translation>位置</translation> </message> @@ -7850,81 +7890,81 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> - <source>Enter URL for images</source> - <translation>輸入圖片 URL</translation> + <source>Enter URL for media files</source> + <translation type="unfinished"/> </message> </context> <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="59"/> <source>Check for updates.</source> <translation>檢查有無更新。</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="60"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface 無法確認更新。</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="65"/> <source>The following error occurred:</source> <translation>錯誤持續發生:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="66"/> <source>Please check your internet connection.</source> <translation>請確認您的網路連線。</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="76"/> <source>You are using the latest version of Subsurface.</source> <translation>您已使用最新版的 Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>新版 Subsurface 已提供使用,<br/>點選下載:<br/><a href="%1">%1</a><br/></translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="85"/> <source>A new version of Subsurface is available.</source> <translation>新版 Subsurface 已提供使用.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="86"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>最新版本是 %1,請確認 %2 於下載頁面 %3,取得更新資訊。</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="96"/> <source>Newest release version is </source> <translation>最新釋出版本是</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="97"/> <source>The server returned the following information:</source> <translation>主機回傳下列資訊:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="114"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface每兩周會定期是否有新版本更新. 如果不希望Subsurface持續檢查, 請點選拒絕. </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Decline</source> <translation>取消</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Accept</source> <translation>同意</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Automatic check for updates</source> <translation>自動更新檢查</translation> </message> @@ -8100,6 +8140,19 @@ Language: %1</source> </message> </context> <context> + <name>VideoFrameExtractor</name> + <message> + <location filename="../core/videoframeextractor.cpp" line="93"/> + <source>ffmpeg failed to start - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/videoframeextractor.cpp" line="99"/> + <source>failed waiting for ffmpeg - video thumbnail creation suspended</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WSInfoModel</name> <message> <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> @@ -8155,12 +8208,12 @@ Language: %1</source> <translation>上傳</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> <source>Operation timed out</source> <translation>操作時間結束</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> <source>Transferring data...</source> <translation>傳送資料...</translation> </message> @@ -8186,8 +8239,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> <source>No error</source> <translation>無錯誤</translation> </message> @@ -8311,7 +8364,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="810"/> + <location filename="../core/libdivecomputer.c" line="829"/> <source>Error parsing the header</source> <translation>檔頭解析錯誤</translation> </message> @@ -8648,9 +8701,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="36"/> - <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1161"/> - <location filename="../core/planner.c" line="1164"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1148"/> <source>oxygen</source> <translation>氧氣</translation> </message> @@ -8665,131 +8718,131 @@ Maximum</source> <translation>開放式</translation> </message> <message> - <location filename="../core/dive.c" line="295"/> + <location filename="../core/dive.c" line="294"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="300"/> + <location filename="../core/dive.c" line="299"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="655"/> - <location filename="../core/qthelper.cpp" line="847"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="629"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> - <location filename="../core/qthelper.cpp" line="658"/> - <location filename="../core/qthelper.cpp" line="849"/> - <location filename="../core/qthelper.cpp" line="1318"/> + <location filename="../core/dive.c" line="303"/> + <location filename="../core/qthelper.cpp" line="632"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1303"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="341"/> + <location filename="../core/dive.c" line="340"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="346"/> - <location filename="../core/qthelper.cpp" line="1342"/> + <location filename="../core/dive.c" line="345"/> + <location filename="../core/qthelper.cpp" line="1327"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="387"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="586"/> - <location filename="../core/qthelper.cpp" line="765"/> - <location filename="../core/qthelper.cpp" line="1294"/> + <location filename="../core/dive.c" line="386"/> + <location filename="../core/qthelper.cpp" line="545"/> + <location filename="../core/qthelper.cpp" line="560"/> + <location filename="../core/qthelper.cpp" line="739"/> + <location filename="../core/qthelper.cpp" line="1279"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="392"/> - <location filename="../core/qthelper.cpp" line="574"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="767"/> - <location filename="../core/qthelper.cpp" line="1293"/> + <location filename="../core/dive.c" line="391"/> + <location filename="../core/qthelper.cpp" line="548"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="741"/> + <location filename="../core/qthelper.cpp" line="1278"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="415"/> + <location filename="../core/dive.c" line="414"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="417"/> + <location filename="../core/dive.c" line="416"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="422"/> + <location filename="../core/dive.c" line="421"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="424"/> + <location filename="../core/dive.c" line="423"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="443"/> - <location filename="../core/qthelper.cpp" line="597"/> - <location filename="../core/qthelper.cpp" line="607"/> - <location filename="../core/qthelper.cpp" line="822"/> - <location filename="../core/qthelper.cpp" line="1270"/> + <location filename="../core/dive.c" line="442"/> + <location filename="../core/qthelper.cpp" line="571"/> + <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="1255"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="447"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="605"/> - <location filename="../core/qthelper.cpp" line="820"/> - <location filename="../core/qthelper.cpp" line="1269"/> + <location filename="../core/dive.c" line="446"/> + <location filename="../core/qthelper.cpp" line="569"/> + <location filename="../core/qthelper.cpp" line="579"/> + <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="1254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="683"/> - <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/divelist.c" line="667"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1141"/> + <location filename="../core/planner.c" line="1144"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../core/equipment.c" line="89"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="185"/> + <location filename="../core/equipment.c" line="175"/> <source>integrated</source> <translation>整合型</translation> </message> <message> - <location filename="../core/equipment.c" line="186"/> + <location filename="../core/equipment.c" line="176"/> <source>belt</source> <translation>配重帶</translation> </message> <message> - <location filename="../core/equipment.c" line="187"/> + <location filename="../core/equipment.c" line="177"/> <source>ankle</source> <translation>腳踝</translation> </message> <message> - <location filename="../core/equipment.c" line="188"/> + <location filename="../core/equipment.c" line="178"/> <source>backplate</source> <translation>背飛</translation> </message> <message> - <location filename="../core/equipment.c" line="189"/> + <location filename="../core/equipment.c" line="179"/> <source>clip-on</source> <translation>吊掛式</translation> </message> @@ -8866,123 +8919,123 @@ Maximum</source> <translation>'%s' 無潛水資料</translation> </message> <message> - <location filename="../core/git-access.c" line="73"/> + <location filename="../core/git-access.c" line="82"/> <source>Checkout from storage (%lu/%lu)</source> <translation>自儲存空間查看 (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="104"/> + <location filename="../core/git-access.c" line="113"/> <source>Transfer from storage (%d/%d)</source> <translation>自儲存空間傳輸 (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="116"/> + <location filename="../core/git-access.c" line="125"/> <source>Transfer to storage (%d/%d)</source> <translation>傳輸至儲存空間 (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="152"/> + <location filename="../core/git-access.c" line="161"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>本地端暫存目錄 %s 損壞 - 無法與 Subsurface 雲端進行同步</translation> </message> <message> - <location filename="../core/git-access.c" line="175"/> - <location filename="../core/git-access.c" line="195"/> + <location filename="../core/git-access.c" line="184"/> + <location filename="../core/git-access.c" line="204"/> <source>Could not update local cache to newer remote data</source> <translation>無法更新本地端暫存來更新遠端資料</translation> </message> <message> - <location filename="../core/git-access.c" line="188"/> + <location filename="../core/git-access.c" line="197"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface 雲端裝置中斷</translation> </message> <message> - <location filename="../core/git-access.c" line="324"/> + <location filename="../core/git-access.c" line="333"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>無法更新 Subsurface 雲端裝置, 請稍待後重試</translation> </message> <message> - <location filename="../core/git-access.c" line="384"/> + <location filename="../core/git-access.c" line="393"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>遠端裝置與本地端資料分歧. 錯誤: 合併失敗 (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="414"/> + <location filename="../core/git-access.c" line="423"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>遠端裝置與本機端資料分歧. 無法合併本機端與遠端的差異資料</translation> </message> <message> - <location filename="../core/git-access.c" line="448"/> + <location filename="../core/git-access.c" line="457"/> <source>Remote storage and local data diverged</source> <translation>遠端裝置與本機端資料分歧</translation> </message> <message> - <location filename="../core/git-access.c" line="451"/> + <location filename="../core/git-access.c" line="460"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>遠端裝置與本機端資料分歧. 錯誤: 寫入資料失敗 (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="460"/> + <location filename="../core/git-access.c" line="469"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Subsurface 雲端資料於本機端的暫存錯誤</translation> </message> <message> - <location filename="../core/git-access.c" line="461"/> + <location filename="../core/git-access.c" line="470"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>搬移暫存資料至 %s. 請再嘗試操作. </translation> </message> <message> - <location filename="../core/git-access.c" line="508"/> + <location filename="../core/git-access.c" line="517"/> <source>Update local storage to match cloud storage</source> <translation>更新本機端資料來符合雲端空間資料</translation> </message> <message> - <location filename="../core/git-access.c" line="516"/> + <location filename="../core/git-access.c" line="525"/> <source>Push local changes to cloud storage</source> <translation>傳送本機端修改至雲端空間</translation> </message> <message> - <location filename="../core/git-access.c" line="534"/> + <location filename="../core/git-access.c" line="543"/> <source>Try to merge local changes into cloud storage</source> <translation>嘗試合併本機端變更至雲端空間</translation> </message> <message> - <location filename="../core/git-access.c" line="576"/> + <location filename="../core/git-access.c" line="585"/> <source>Store data into cloud storage</source> <translation>儲存資料至雲端空間</translation> </message> <message> - <location filename="../core/git-access.c" line="600"/> + <location filename="../core/git-access.c" line="609"/> <source>Sync with cloud storage</source> <translation>雲端空間同步</translation> </message> <message> - <location filename="../core/git-access.c" line="627"/> + <location filename="../core/git-access.c" line="636"/> <source>Can't reach cloud server, working with local data</source> <translation>無法連結雲端伺服器, 本機端資料運作</translation> </message> <message> - <location filename="../core/git-access.c" line="640"/> + <location filename="../core/git-access.c" line="649"/> <source>Successful cloud connection, fetch remote</source> <translation>雲端連結成功, 取得控制</translation> </message> <message> - <location filename="../core/git-access.c" line="659"/> + <location filename="../core/git-access.c" line="668"/> <source>Done syncing with cloud storage</source> <translation>雲端空間同步結束</translation> </message> <message> - <location filename="../core/git-access.c" line="794"/> + <location filename="../core/git-access.c" line="803"/> <source>Error connecting to Subsurface cloud storage</source> <translation>錯誤連結至 Subsurface 雲端裝置</translation> </message> <message> - <location filename="../core/git-access.c" line="797"/> + <location filename="../core/git-access.c" line="806"/> <source>git clone of %s failed (%s)</source> <translation>git clone %s 失敗 (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="823"/> + <location filename="../core/git-access.c" line="832"/> <source>Synchronising data file</source> <translation>同步資料檔案</translation> </message> @@ -9081,119 +9134,119 @@ Maximum</source> <translation>錯誤的事件編號</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="612"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the datetime</source> <translation>日期時間解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="649"/> <source>Dive %d: %s</source> <translation>潛水 %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="636"/> + <location filename="../core/libdivecomputer.c" line="655"/> <source>Error parsing the divetime</source> <translation>潛水時間解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="646"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the maxdepth</source> <translation>最大深度解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="684"/> <source>Error parsing temperature</source> <translation>錯誤溫度解析</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="685"/> + <location filename="../core/libdivecomputer.c" line="704"/> <source>Error parsing the gas mix count</source> <translation>混合氣體數量解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="697"/> + <location filename="../core/libdivecomputer.c" line="716"/> <source>Error obtaining water salinity</source> <translation>得到錯誤的海水鹽度</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="706"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining surface pressure</source> <translation>得到錯誤的水面壓力</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="750"/> <source>Error obtaining dive mode</source> <translation>取得潛水模式錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="754"/> + <location filename="../core/libdivecomputer.c" line="773"/> <source>Error parsing the gas mix</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="780"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Unable to create parser for %s %s</source> <translation>無法建立解析 %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="786"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="817"/> + <location filename="../core/libdivecomputer.c" line="836"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="824"/> + <location filename="../core/libdivecomputer.c" line="843"/> <source>Already downloaded dive at %s</source> <translation>已自 %s 下載潛水</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1074"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1112"/> <source>model=%s firmware=%u serial=%u</source> <translation>機型=%s 韌體=%u 序號=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1159"/> + <location filename="../core/libdivecomputer.c" line="1178"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1164"/> + <location filename="../core/libdivecomputer.c" line="1183"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1185"/> + <location filename="../core/libdivecomputer.c" line="1204"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1369"/> + <location filename="../core/libdivecomputer.c" line="1394"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1378"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1389"/> + <location filename="../core/libdivecomputer.c" line="1414"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>開啟裝置錯誤 %s %s (%s). 在多數情況下, 為了追蹤此問題, 將日誌檔案傳送給開發者, 是有幫助的. 您可以在關於頁面點選按鈕來複製至剪貼簿. </translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1391"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9202,13 +9255,13 @@ You can create this logfile by selecting the corresponding checkbox in the downl 您可以在下載頁面勾選相對應的選項, 來建立日誌檔案.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1428"/> <source>No new dives downloaded from dive computer</source> <translation>潛水電腦無新的潛水日誌下載</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1159"/> + <location filename="../core/parse-xml.c" line="1172"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>此潛點有複數個 GPS位置; 並 %s @@ -9216,19 +9269,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="472"/> <source>additional name for site: %s </source> <translation>潛點別名: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1673"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>自本機端載入潛水</translation> </message> <message> - <location filename="../core/load-git.c" line="1677"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>成功開啟潛水資料</translation> </message> @@ -9251,12 +9304,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1624"/> + <location filename="../core/parse-xml.c" line="1636"/> <source>Failed to parse '%s'</source> <translation>無法解析訊息 '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2057"/> + <location filename="../core/parse-xml.c" line="2136"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> @@ -9287,8 +9340,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="322"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> + <location filename="../core/planner.c" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> <source>SP change</source> <translation>SP 變更</translation> </message> @@ -9550,17 +9603,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="893"/> + <location filename="../core/planner.c" line="877"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> <message> - <location filename="../core/planner.c" line="1165"/> + <location filename="../core/planner.c" line="1149"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1393"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9569,77 +9622,77 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1404"/> <source>T: %.1f%s </source> <translation>T: %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1410"/> <source>V: %.1f%s </source> <translation>V: %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1413"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1415"/> <source>CNS: %u%% </source> <translation>CNS: %u%%</translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1417"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar</translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1419"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar</translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1421"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar</translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1424"/> <source>MOD: %d%s </source> <translation>MOD: %d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1464"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1456"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>安全停留: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1400"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1433"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9648,7 +9701,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1433"/> + <location filename="../core/profile.c" line="1439"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9657,175 +9710,175 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1444"/> <source>Density: %.1fg/ℓ </source> <translation>密度: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1453"/> + <location filename="../core/profile.c" line="1459"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>安全停留: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1467"/> <source>Deco: unknown time @ %.0f%s </source> <translation>減壓: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1465"/> + <location filename="../core/profile.c" line="1471"/> <source>In deco </source> <translation>減壓中 </translation> </message> <message> - <location filename="../core/profile.c" line="1467"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1476"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1479"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>減壓: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1487"/> <source>In deco (calc) </source> <translation>減壓 (計算) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1490"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (預計) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1492"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1490"/> + <location filename="../core/profile.c" line="1496"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1492"/> + <location filename="../core/profile.c" line="1498"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1501"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1498"/> + <location filename="../core/profile.c" line="1504"/> <source>Calculated ceiling %.0f%s </source> <translation>計算的上限深度 %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1510"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>組織 %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1510"/> + <location filename="../core/profile.c" line="1516"/> <source>ICD in leading tissue </source> <translation>領先組織的 ICD </translation> </message> <message> - <location filename="../core/profile.c" line="1512"/> + <location filename="../core/profile.c" line="1518"/> <source>heart rate: %d </source> <translation>心率: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1514"/> + <location filename="../core/profile.c" line="1520"/> <source>bearing: %d </source> <translation>方位: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1523"/> <source>mean depth to here %.1f%s </source> <translation>至此的平均深度 %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1614"/> + <location filename="../core/profile.c" line="1620"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1649"/> + <location filename="../core/profile.c" line="1655"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1674"/> + <location filename="../core/profile.c" line="1680"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1618"/> - <location filename="../core/profile.c" line="1622"/> - <location filename="../core/profile.c" line="1626"/> + <location filename="../core/profile.c" line="1624"/> + <location filename="../core/profile.c" line="1628"/> + <location filename="../core/profile.c" line="1632"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1630"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1634"/> + <location filename="../core/profile.c" line="1640"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> - <location filename="../core/profile.c" line="1642"/> + <location filename="../core/profile.c" line="1644"/> + <location filename="../core/profile.c" line="1648"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> @@ -9874,142 +9927,142 @@ EADD: %d%s / %.1fg/ℓ <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="793"/> + <location filename="../core/qthelper.cpp" line="590"/> + <location filename="../core/qthelper.cpp" line="767"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="619"/> - <location filename="../core/qthelper.cpp" line="795"/> + <location filename="../core/qthelper.cpp" line="593"/> + <location filename="../core/qthelper.cpp" line="769"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="870"/> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="844"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>AIR</source> <translation>空氣</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="846"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="947"/> + <location filename="../core/qthelper.cpp" line="921"/> <source>more than %1 days</source> <translation>超過 %1 日</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1010"/> + <location filename="../core/qthelper.cpp" line="984"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>(%n 潛水(s))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1246"/> + <location filename="../core/qthelper.cpp" line="1231"/> <source>OXYGEN</source> <translation>OXYGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1341"/> + <location filename="../core/qthelper.cpp" line="1326"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/save-html.c" line="472"/> - <location filename="../core/save-html.c" line="556"/> + <location filename="../core/save-html.c" line="476"/> + <location filename="../core/save-html.c" line="560"/> <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>無法開啟檔案 %s</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="495"/> <source>Number</source> <translation>編號</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="496"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="497"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="498"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="499"/> <source>Air temp.</source> <translation>氣溫</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="500"/> <source>Water temp.</source> <translation>水溫</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="501"/> <source>Dives</source> <translation>潛水</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="502"/> <source>Expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="503"/> <source>Collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../core/save-html.c" line="500"/> + <location filename="../core/save-html.c" line="504"/> <source>Trips</source> <translation>旅程</translation> </message> <message> - <location filename="../core/save-html.c" line="501"/> + <location filename="../core/save-html.c" line="505"/> <source>Statistics</source> <translation>統計</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="506"/> <source>Advanced search</source> <translation>進階搜尋</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="509"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="510"/> <source>Visibility</source> <translation>能見度</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="511"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="512"/> <source>Divemaster</source> <translation>潛導</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="513"/> <source>Buddy</source> <translation>潛伴</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="514"/> <source>Suit</source> <translation>防寒衣</translation> </message> @@ -10020,180 +10073,180 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/divesite-helper.cpp" line="29"/> - <location filename="../core/save-html.c" line="511"/> + <location filename="../core/save-html.c" line="515"/> <source>Tags</source> <translation>標籤</translation> </message> <message> - <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="296"/> - <location filename="../smtk-import/smartrak.c" line="369"/> + <location filename="../core/save-html.c" line="516"/> + <location filename="../smtk-import/smartrak.c" line="256"/> + <location filename="../smtk-import/smartrak.c" line="329"/> <source>Notes</source> <translation>記錄</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="517"/> <source>Show more details</source> <translation>顯示更多細節</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="520"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="521"/> <source>Year</source> <translation>年</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="522"/> <source>Total time</source> <translation>全部時間</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="523"/> <source>Average time</source> <translation>平均時間</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="524"/> <source>Shortest time</source> <translation>最短時間</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="525"/> <source>Longest time</source> <translation>最長時間</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="526"/> <source>Average depth</source> <translation>平均深度</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="527"/> <source>Min. depth</source> <translation>最小深度</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="528"/> <source>Max. depth</source> <translation>最大深度</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="529"/> <source>Average SAC</source> <translation>平均SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="530"/> <source>Min. SAC</source> <translation>最小SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="531"/> <source>Max. SAC</source> <translation>最大SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="532"/> <source>Average temp.</source> <translation>平均溫度</translation> </message> <message> - <location filename="../core/save-html.c" line="529"/> + <location filename="../core/save-html.c" line="533"/> <source>Min. temp.</source> <translation>最低溫度</translation> </message> <message> - <location filename="../core/save-html.c" line="530"/> + <location filename="../core/save-html.c" line="534"/> <source>Max. temp.</source> <translation>最高溫度</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> + <location filename="../core/save-html.c" line="535"/> <source>Back to list</source> <translation>回到列表</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="538"/> <source>Dive #</source> <translation>潛水編號 #</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> + <location filename="../core/save-html.c" line="539"/> <source>Dive profile</source> <translation>潛水摘要</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="540"/> <source>Dive information</source> <translation>潛水資訊</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="541"/> <source>Dive equipment</source> <translation>潛水裝備</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="549"/> <source>Type</source> <translation>類型</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="543"/> <source>Size</source> <translation>容量</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="544"/> <source>Work pressure</source> <translation>工作壓力</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="545"/> <source>Start pressure</source> <translation>開始壓力</translation> </message> <message> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="546"/> <source>End pressure</source> <translation>結束壓力</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="547"/> <source>Gas</source> <translation>氣體</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="548"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="550"/> <source>Events</source> <translation>事件</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="551"/> <source>Name</source> <translation>名字</translation> </message> <message> - <location filename="../core/save-html.c" line="548"/> + <location filename="../core/save-html.c" line="552"/> <source>Value</source> <translation>數值</translation> </message> <message> - <location filename="../core/save-html.c" line="549"/> + <location filename="../core/save-html.c" line="553"/> <source>Coordinates</source> <translation>座標</translation> </message> <message> - <location filename="../core/save-html.c" line="550"/> + <location filename="../core/save-html.c" line="554"/> <source>Dive status</source> <translation>潛水狀態</translation> </message> @@ -10223,62 +10276,62 @@ EADD: %d%s / %.1fg/ℓ <translation>全部 (根據旅程資訊)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jan</source> <translation>1月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Feb</source> <translation>2月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Mar</source> <translation>3月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Apr</source> <translation>4月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>May</source> <translation>5月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="115"/> <source>Jun</source> <translation>6月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Jul</source> <translation>7月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Aug</source> <translation>8月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Sep</source> <translation>9月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Oct</source> <translation>10月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Nov</source> <translation>11月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="116"/> <source>Dec</source> <translation>12月</translation> </message> @@ -10529,12 +10582,17 @@ Uemis Zurich 已正確插入?</translation> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/qthelper.h" line="74"/> + <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> <message> + <location filename="../core/divelogexportlogic.cpp" line="152"/> + <source>Cannot find a folder called 'theme' in the standard locations</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>最大深度</translation> @@ -10560,77 +10618,77 @@ Uemis Zurich 已正確插入?</translation> <translation>記錄:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Built</source> <translation>建造</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank</source> <translation>沉沒</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="252"/> <source>Sank Time</source> <translation>下潛時間</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Reason</source> <translation>理由</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Nationality</source> <translation>國籍</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="253"/> <source>Shipyard</source> <translation>船廠</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>ShipType</source> <translation>船隻種類</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Length</source> <translation>長度</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Beam</source> <translation>橫樑</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Draught</source> <translation>草案</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Displacement</source> <translation>移位</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="295"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Cargo</source> <translation>船艙</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="307"/> + <location filename="../smtk-import/smartrak.c" line="267"/> <source>Wreck Data</source> <translation>沈船資料</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Altitude</source> <translation>海拔</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="328"/> <source>Depth</source> <translation>深度</translation> </message> @@ -10675,27 +10733,27 @@ Uemis Zurich 已正確插入?</translation> <translation>城市</translation> </message> <message> - <location filename="../core/save-git.c" line="951"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving data</source> <translation>開始儲存資料</translation> </message> <message> - <location filename="../core/save-git.c" line="960"/> + <location filename="../core/save-git.c" line="952"/> <source>Start saving dives</source> <translation>開始儲存潛水記錄</translation> </message> <message> - <location filename="../core/save-git.c" line="993"/> + <location filename="../core/save-git.c" line="985"/> <source>Done creating local cache</source> <translation>分配本機端空間成功</translation> </message> <message> - <location filename="../core/save-git.c" line="1244"/> + <location filename="../core/save-git.c" line="1236"/> <source>Preparing to save data</source> <translation>準備儲存資料</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>modechange</source> <translation>模式變更</translation> </message> @@ -10710,7 +10768,7 @@ Uemis Zurich 已正確插入?</translation> <translation>移除此點</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Don't save an empty log to the cloud</source> <translation>無法上傳空白日誌至雲端</translation> </message> @@ -10730,22 +10788,22 @@ Uemis Zurich 已正確插入?</translation> <translation>最高</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> <source>Invalid response from server</source> <translation>主機回傳不正確的回應.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>預期的 XML 標籤 'DiveDateReader', 取代了 '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>無法找到預期的 XML 標籤 'DiveDates'</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> <source>Malformed XML response. Line %1: %2</source> <translation>異常的 XML 回應. 第 %1 行: %2</translation> </message> @@ -10758,112 +10816,102 @@ Uemis Zurich 已正確插入?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>Dive list</source> <translation>潛水列表</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="219"/> <source>Dive management</source> <translation>潛水管理</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Disable auto cloud sync</source> <translation>關閉雲端同步</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="281"/> <source>Enable auto cloud sync</source> <translation>啟動自動雲端同步</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Disable location service</source> <translation>關閉定位功能</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="350"/> <source>Settings</source> <translation>設定</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="218"/> + <location filename="../mobile-widgets/qml/main.qml" line="224"/> <source>Add dive manually</source> <translation>手動增加潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Download from DC</source> <translation>自潛水電腦下載</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="253"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Manual sync with cloud</source> <translation>手動雲端同步</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="280"/> + <location filename="../mobile-widgets/qml/main.qml" line="286"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>關閉雲端自動同步會使資料僅能在本機端使用. 在無網路連結情況下, 此為有效的解決對策. 若有網路連結, 需要同步資料至雲端, 請選擇 '手動雲端同步'. </translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="291"/> + <location filename="../mobile-widgets/qml/main.qml" line="297"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="399"/> + <location filename="../mobile-widgets/qml/main.qml" line="385"/> <source>Help</source> <translation>幫助</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>Upload GPS data</source> - <translation>上傳 GPS 資料</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="244"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Apply GPS fixes</source> <translation>套入GPS座標點</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> - <source>Download GPS data</source> - <translation>下載 GPS 資料</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>Show GPS fixes</source> <translation>顯示 GPS 位置</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="317"/> <source>Clear GPS cache</source> <translation>清除 GPS 暫存</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="363"/> <source>Developer</source> <translation>開發人員</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="380"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>App log</source> <translation>App 日誌</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="388"/> + <location filename="../mobile-widgets/qml/main.qml" line="374"/> <source>Theme information</source> <translation>主題資訊</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="355"/> + <location filename="../mobile-widgets/qml/main.qml" line="339"/> <source>About</source> <translation>關於</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="344"/> + <location filename="../mobile-widgets/qml/main.qml" line="328"/> <source>Run location service</source> <translation>啟動位置服務</translation> </message> |